diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84befc43da..7d726a5e22 100644
--- 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)
 
diff --git a/Makefile.in b/Makefile.in
index 91d6281b53..6dfa3cb782 100644
--- 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
 
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 8d9e122a8a..7607d65a88 100644
--- 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=""
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 7c17434719..1fe539ad02 100644
--- 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">
diff --git a/build/bakefiles/expat.bkl b/build/bakefiles/expat.bkl
index 5cef4ed12e..0f01e4da55 100644
--- 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
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b7cc9e1699..d8040db5e4 100644
--- 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>
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 75cc4a916f..db51714b9e 100644
--- 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
+)
+
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 709a59760f..f5a613c7bf 100644
--- 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)
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 0c320ae1d7..1b6604deef 100644
--- 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()
diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
index 82b79518fa..25bb80801e 100644
--- 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
diff --git a/build/cmake/tests/gui/CMakeLists.txt b/build/cmake/tests/gui/CMakeLists.txt
index 44aa37cbdf..75db39bb99 100644
--- 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()
diff --git a/build/files b/build/files
index 8df05a9460..9db1570b85 100644
--- 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 =
+
diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj
index a7b2275d59..cc7dd28bf3 100644
--- 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 */,
diff --git a/build/update-setup-h b/build/update-setup-h
index 924cde642c..d43db13cd5 100755
--- 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
 ##############################################################################
 
diff --git a/build/upmake b/build/upmake
index 33b6d0c7fb..de8d1c80b4 100755
--- 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)],
diff --git a/build/upmake_script.pl b/build/upmake_script.pl
index f11bbeaf72..594e553c74 100755
--- 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)],
diff --git a/configure b/configure
index e6ec44da26..1415627456 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index 0d498f3ea9..fc8b1de49b 100644
--- 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
diff --git a/demos/forty/pile.cpp b/demos/forty/pile.cpp
index a04978bfed..0ddab95dfc 100644
--- 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)
diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index b509a259f5..bf5bb2461e 100644
--- 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;
 
diff --git a/demos/life/game.h b/demos/life/game.h
index 35e28a74e0..3c35e9575a 100644
--- 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.
diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 9f24e2566a..d51be491a3 100644
--- 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);
 
diff --git a/docs/changes.txt b/docs/changes.txt
index 3a288f2ca3..af29fa7cf9 100644
--- 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
 -----------------------------------------------------
diff --git a/docs/contributing/how-to-add-class-documentation.md b/docs/contributing/how-to-add-class-documentation.md
index 31e321a2b4..12779e9901 100644
--- 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.
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 3c7b5d26b1..14691922ce 100644
--- 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
diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h
index 12f1f9334d..921f3c9606 100644
--- 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.}
diff --git a/docs/doxygen/mainpages/copyright.h b/docs/doxygen/mainpages/copyright.h
index d9c39afcf3..531e4c2b4c 100644
--- a/docs/doxygen/mainpages/copyright.h
+++ b/docs/doxygen/mainpages/copyright.h
@@ -11,7 +11,7 @@
 
 @section section_copyright wxWidgets Copyrights and Licenses
 
-Copyright (c) 1992-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.
 
diff --git a/docs/doxygen/overviews/eventhandling.h b/docs/doxygen/overviews/eventhandling.h
index b3195d5ebe..5ac2d0b692 100644
--- 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
 
diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh
index 67eb292b0f..97029043c6 100755
--- 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
 
diff --git a/docs/doxygen/scripts/write_info_tag.py b/docs/doxygen/scripts/write_info_tag.py
new file mode 100755
index 0000000000..d386381287
--- /dev/null
+++ 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 )
diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 375c70e04b..61a62d39fc 100644
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/aboutdlg.h b/include/wx/aboutdlg.h
index 975b5def27..0143154bc4 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index 145bd98df7..e091465375 100644
--- 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:
diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h
index 0530e309de..4b51a96d0e 100644
--- 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
diff --git a/include/wx/cmdargs.h b/include/wx/cmdargs.h
index 6091730947..9df612fb63 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 7eb7cc9a42..7fb04dd097 100644
--- 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,
diff --git a/include/wx/colour.h b/include/wx/colour.h
index e9a13ef95e..87253462b5 100644
--- 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
     // ------------
 
diff --git a/include/wx/containr.h b/include/wx/containr.h
index 4c0d9d5de8..c9eb5857c5 100644
--- 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:
diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index a261ad0de8..c25c91fe1c 100644
--- 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
  */
 
diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index a3c236781a..630f72b16c 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h
index 2032d89a71..8b1d424dfe 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/dc.h b/include/wx/dc.h
index dd5eb2251d..847b7f64e5 100644
--- 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
diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 0c4fdd575a..2a64f8882c 100644
--- 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);
 };
 
 
diff --git a/include/wx/debug.h b/include/wx/debug.h
index 13f3cb7d55..406b4740a0 100644
--- 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) )                                        \
             {                                                                 \
diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h
index a1d808bf70..96150af48e 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index b068129ae2..14f667fa68 100644
--- 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)
diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index f62d21c2fd..08f879b4d1 100644
--- 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;
 };
 
diff --git a/include/wx/generic/aboutdlgg.h b/include/wx/generic/aboutdlgg.h
index f6e8fe4bf9..6b363e26a3 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h
index 84076816c0..275c0494a6 100644
--- 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);
 };
 
diff --git a/include/wx/generic/ctrlsub.h b/include/wx/generic/ctrlsub.h
index 0dd113dcf9..86c47f15d2 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index f1159daf9f..040035ba72 100644
--- 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;
 
diff --git a/include/wx/generic/mask.h b/include/wx/generic/mask.h
index 454ba11cda..99307b3a27 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/generic/notifmsg.h b/include/wx/generic/notifmsg.h
index ccc55108c5..ee178c2f9d 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/generic/private/textmeasure.h b/include/wx/generic/private/textmeasure.h
index 6cd900e945..c6145b91e2 100644
--- 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);
 };
diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index b2316067e5..588472e8c8 100644
--- 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;
 
diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index c60c601b8e..0c6c6c7dd8 100644
--- 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;
diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h
index 57a6f28c3a..0f4d897598 100644
--- 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;
diff --git a/include/wx/gtk/private/mnemonics.h b/include/wx/gtk/private/mnemonics.h
index 0b6e4ba45a..1a4bde3bb7 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/gtk/private/object.h b/include/wx/gtk/private/object.h
index ca09ed0d38..05fb367de4 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/gtk/private/string.h b/include/wx/gtk/private/string.h
index 051c94132c..981bf00a81 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index d411188a66..d1e4e5ee71 100644
--- 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;
diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 757917e5a8..aaf777a515 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/gtk1/private/mnemonics.h b/include/wx/gtk1/private/mnemonics.h
index 98907cd779..8caa81eacc 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 02f54a47c5..4a41262e5c 100644
--- 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;
diff --git a/include/wx/motif/ctrlsub.h b/include/wx/motif/ctrlsub.h
index 73eef28ff4..f6104ccffa 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/motif/textentry.h b/include/wx/motif/textentry.h
index 5cb18a715d..bbea3349c2 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 6f1e7a88ae..8fa50253ba 100644
--- 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);
diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h
index f49350b544..9de5883b30 100644
--- 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;
diff --git a/include/wx/msw/ctrlsub.h b/include/wx/msw/ctrlsub.h
index e3d9d6e63a..3c658bc4d5 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/datectrl.h b/include/wx/msw/datectrl.h
index 08e4536a64..b78b28f7a0 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/datetimectrl.h b/include/wx/msw/datetimectrl.h
index ef7e37069e..97afc1f40c 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/debughlp.h b/include/wx/msw/debughlp.h
index 175abbc1d5..94a399cbdf 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index 911d77d385..5616631f94 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/evtloopconsole.h b/include/wx/msw/evtloopconsole.h
index 87217bc64b..a552225e15 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index 0b3b780d2a..a83192b6e9 100644
--- 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;
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 961e78b2b3..3ba0175320 100644
--- 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();
 
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 2c27e56b6a..78da57b6cc 100644
--- 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);
diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index f670b1b843..39c9ed4693 100644
--- 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;
     }
 };
 
diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 38a4582e25..d79bdb3ac7 100644
--- 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
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 9b47c6f528..e04c44db50 100644
--- 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
diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h
index 91dbbede2a..b79aa8e094 100644
--- 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
 // ----------------------------------------------------------------------------
diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index eddb0cdd5e..15cdb98f40 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h
index 6a1ea9dbec..c764432c9d 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/stackwalk.h b/include/wx/msw/stackwalk.h
index e068ea2d95..072a49b464 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/stdpaths.h b/include/wx/msw/stdpaths.h
index 154ab40e97..bfddf168c4 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/subwin.h b/include/wx/msw/subwin.h
index b38d2037ad..a0178147e7 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h
index 5d3a0d9e8a..0b11a2ffa1 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/timectrl.h b/include/wx/msw/timectrl.h
index 354379467d..3608e640fc 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index 5423f771f1..ba3581515b 100644
--- 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);
diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 8e79013a5e..0256104ebc 100644
--- 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;
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index dd8741dcd7..35df830c3f 100644
--- 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
diff --git a/include/wx/msw/wrapgdip.h b/include/wx/msw/wrapgdip.h
index 06f1401912..b5cd72178b 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/msw/wrapshl.h b/include/wx/msw/wrapshl.h
index e0470242ae..06ae96e146 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h
index ebde3ded93..fc10767e2e 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h
index 888c93118e..36b59e8c87 100644
--- 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 04d0c867d1..85f6a87e04 100644
--- 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_
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 33253d5613..fb2a62ae28 100644
--- 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);
 };
diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h
index 072cfa4d16..acb7702591 100644
--- 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);
diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 5726b211b9..cf20fbcb56 100644
--- 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);
diff --git a/include/wx/osx/carbon/private/print.h b/include/wx/osx/carbon/private/print.h
index eeda2bef28..fa1ce4126c 100644
--- 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:
diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h
index 1aa40e46e2..a5a1b87e2b 100644
--- a/include/wx/osx/carbon/region.h
+++ b/include/wx/osx/carbon/region.h
@@ -37,24 +37,24 @@ public:
     virtual ~wxRegion();
 
     // wxRegionBase methods
-    virtual void Clear();
-    virtual bool IsEmpty() const;
+    virtual void Clear() wxOVERRIDE;
+    virtual bool IsEmpty() const wxOVERRIDE;
 
     // Internal
     WXHRGN GetWXHRGN() 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;
 
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
+    virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
+    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
+    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
+    virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
 
-    virtual bool DoOffset(wxCoord x, wxCoord y);
-    virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
-    virtual bool DoUnionWithRect(const wxRect& rect);
+    virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
+    virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE;
+    virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxRegion);
diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index c81865fbce..9734b60413 100644
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -30,17 +30,17 @@ public:
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxCheckBoxNameStr);
-    virtual void SetValue(bool);
-    virtual bool GetValue() const;
+    virtual void SetValue(bool) wxOVERRIDE;
+    virtual bool GetValue() const wxOVERRIDE;
 
-    virtual void Command(wxCommandEvent& event);
+    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;
 protected:
-    void DoSet3StateValue(wxCheckBoxState val);
-    virtual wxCheckBoxState DoGet3StateValue() const;
+    void DoSet3StateValue(wxCheckBoxState val) wxOVERRIDE;
+    virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 };
@@ -70,11 +70,10 @@ public:
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxCheckBoxNameStr);
-    virtual void SetValue(bool);
-    virtual bool GetValue() const;
-    virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual void SetValue(bool) wxOVERRIDE;
+    virtual bool GetValue() const wxOVERRIDE;
     virtual void SetLabel(const wxBitmap *bitmap);
-    virtual void SetLabel( const wxString & WXUNUSED(name) ) {}
+    virtual void SetLabel( const wxString & WXUNUSED(name) ) wxOVERRIDE {}
 
     wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox);
 };
diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index 4ef0b6b3aa..ca3984a6d5 100644
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -66,28 +66,28 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
-    virtual unsigned int GetCount() const ;
-    virtual int GetSelection() const ;
-    virtual void SetSelection(int n);
+    virtual unsigned int GetCount() const wxOVERRIDE;
+    virtual int GetSelection() const wxOVERRIDE;
+    virtual void SetSelection(int n) wxOVERRIDE;
 
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(unsigned int n) const ;
-    virtual void SetString(unsigned int pos, const wxString& s);
+    virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
+    virtual wxString GetString(unsigned int n) const wxOVERRIDE;
+    virtual void SetString(unsigned int pos, const wxString& s) wxOVERRIDE;
     // osx specific event handling common for all osx-ports
 
-    virtual bool        OSXHandleClicked( double timestampsec );
+    virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE;
 
 protected:
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
+    virtual void DoClear() wxOVERRIDE;
 
-    virtual wxSize DoGetBestSize() const ;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
-                              void **clientData, wxClientDataType type);
+                              void **clientData, wxClientDataType type) wxOVERRIDE;
 
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
+    virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
 
     wxArrayString m_strings;
     wxChoiceDataArray m_datas ;
diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h
index 2c45068e24..77a78f7129 100644
--- a/include/wx/osx/clipbrd.h
+++ b/include/wx/osx/clipbrd.h
@@ -26,33 +26,33 @@ public:
     virtual ~wxClipboard();
 
     // open the clipboard before SetData() and GetData()
-    virtual bool Open();
+    virtual bool Open() wxOVERRIDE;
 
     // close the clipboard after SetData() and GetData()
-    virtual void Close();
+    virtual void Close() wxOVERRIDE;
 
     // query whether the clipboard is opened
-    virtual bool IsOpened() const;
+    virtual bool IsOpened() const wxOVERRIDE;
 
     // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
+    virtual bool SetData( wxDataObject *data ) wxOVERRIDE;
 
     // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
+    virtual bool AddData( wxDataObject *data ) wxOVERRIDE;
 
     // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
+    virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE;
 
     // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
+    virtual bool GetData( wxDataObject& data ) wxOVERRIDE;
 
     // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
+    virtual void Clear() wxOVERRIDE;
 
     // flushes the clipboard: this 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();
+    virtual bool Flush() wxOVERRIDE;
 
 private:
     wxDataObject     *m_data;
diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h
index 12fd66a33a..72998e5e7a 100644
--- a/include/wx/osx/cocoa/evtloop.h
+++ b/include/wx/osx/cocoa/evtloop.h
@@ -3,7 +3,7 @@
 // Purpose:     declaration of wxGUIEventLoop for wxOSX/Cocoa
 // Author:      Vadim Zeitlin
 // Created:     2008-12-28
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -20,18 +20,18 @@ public:
 
     void EndModalSession();
 
-    virtual void WakeUp();
+    virtual void WakeUp() wxOVERRIDE;
 
     void OSXUseLowLevelWakeup(bool useIt)
         { m_osxLowLevelWakeUp = useIt ; }
 
 protected:
-    virtual int DoDispatchTimeout(unsigned long timeout);
+    virtual int DoDispatchTimeout(unsigned long timeout) wxOVERRIDE;
 
-    virtual void OSXDoRun();
-    virtual void OSXDoStop();
+    virtual void OSXDoRun() wxOVERRIDE;
+    virtual void OSXDoStop() wxOVERRIDE;
 
-    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const wxOVERRIDE;
 
     void* m_modalSession;
 
diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index cc990135cc..0f8bff0b67 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -56,8 +56,8 @@ public :
 
     void Init();
 
-    virtual bool        IsVisible() const ;
-    virtual void        SetVisibility(bool);
+    virtual bool        IsVisible() const wxOVERRIDE;
+    virtual void        SetVisibility(bool) wxOVERRIDE;
 
     // we provide a static function which can be reused from
     // wxNonOwnedWindowCocoaImpl too
@@ -68,70 +68,70 @@ public :
 
     virtual bool ShowWithEffect(bool show,
                                 wxShowEffect effect,
-                                unsigned timeout);
+                                unsigned timeout) wxOVERRIDE;
 
-    virtual void        Raise();
+    virtual void        Raise() wxOVERRIDE;
 
-    virtual void        Lower();
+    virtual void        Lower() wxOVERRIDE;
 
-    virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
+    virtual void        ScrollRect( const wxRect *rect, int dx, int dy ) wxOVERRIDE;
 
-    virtual WXWidget    GetWXWidget() const { return m_osxView; }
+    virtual WXWidget    GetWXWidget() const wxOVERRIDE { return m_osxView; }
 
-    virtual void        SetBackgroundColour(const wxColour&);
-    virtual bool        SetBackgroundStyle(wxBackgroundStyle style);
+    virtual void        SetBackgroundColour(const wxColour&) wxOVERRIDE;
+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
 
-    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
-    virtual void        Move(int x, int y, int width, int height);
-    virtual void        GetPosition( int &x, int &y ) const;
-    virtual void        GetSize( int &width, int &height ) const;
-    virtual void        SetControlSize( wxWindowVariant variant );
+    virtual void        GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
+    virtual void        Move(int x, int y, int width, int height) wxOVERRIDE;
+    virtual void        GetPosition( int &x, int &y ) const wxOVERRIDE;
+    virtual void        GetSize( int &width, int &height ) const wxOVERRIDE;
+    virtual void        SetControlSize( wxWindowVariant variant ) wxOVERRIDE;
 
-    virtual void        SetNeedsDisplay( const wxRect* where = NULL );
-    virtual bool        GetNeedsDisplay() const;
+    virtual void        SetNeedsDisplay( const wxRect* where = NULL ) wxOVERRIDE;
+    virtual bool        GetNeedsDisplay() const wxOVERRIDE;
 
-    virtual void        SetDrawingEnabled(bool enabled);
+    virtual void        SetDrawingEnabled(bool enabled) wxOVERRIDE;
 
-    virtual bool        CanFocus() const;
+    virtual bool        CanFocus() const wxOVERRIDE;
     // return true if successful
-    virtual bool        SetFocus();
-    virtual bool        HasFocus() const;
+    virtual bool        SetFocus() wxOVERRIDE;
+    virtual bool        HasFocus() const wxOVERRIDE;
 
-    void                RemoveFromParent();
-    void                Embed( wxWidgetImpl *parent );
+    void                RemoveFromParent() wxOVERRIDE;
+    void                Embed( wxWidgetImpl *parent ) wxOVERRIDE;
 
-    void                SetDefaultButton( bool isDefault );
-    void                PerformClick();
-    virtual void        SetLabel(const wxString& title, wxFontEncoding encoding);
+    void                SetDefaultButton( bool isDefault ) wxOVERRIDE;
+    void                PerformClick() wxOVERRIDE;
+    virtual void        SetLabel(const wxString& title, wxFontEncoding encoding) wxOVERRIDE;
 
-    void                SetCursor( const wxCursor & cursor );
-    void                CaptureMouse();
-    void                ReleaseMouse();
+    void                SetCursor( const wxCursor & cursor ) wxOVERRIDE;
+    void                CaptureMouse() wxOVERRIDE;
+    void                ReleaseMouse() wxOVERRIDE;
 #if wxUSE_DRAG_AND_DROP
-    void                SetDropTarget(wxDropTarget* target);
+    void                SetDropTarget(wxDropTarget* target) wxOVERRIDE;
 #endif
-    wxInt32             GetValue() const;
-    void                SetValue( wxInt32 v );
-    wxBitmap            GetBitmap() const;
-    void                SetBitmap( const wxBitmap& bitmap );
-    void                SetBitmapPosition( wxDirection dir );
-    void                SetupTabs( const wxNotebook &notebook );
-    void                GetBestRect( wxRect *r ) const;
-    bool                IsEnabled() const;
-    void                Enable( bool enable );
-    bool                ButtonClickDidStateChange() { return true ;}
-    void                SetMinimum( wxInt32 v );
-    void                SetMaximum( wxInt32 v );
-    wxInt32             GetMinimum() const;
-    wxInt32             GetMaximum() const;
-    void                PulseGauge();
-    void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
+    wxInt32             GetValue() const wxOVERRIDE;
+    void                SetValue( wxInt32 v ) wxOVERRIDE;
+    wxBitmap            GetBitmap() const wxOVERRIDE;
+    void                SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
+    void                SetBitmapPosition( wxDirection dir ) wxOVERRIDE;
+    void                SetupTabs( const wxNotebook &notebook ) wxOVERRIDE;
+    void                GetBestRect( wxRect *r ) const wxOVERRIDE;
+    bool                IsEnabled() const wxOVERRIDE;
+    void                Enable( bool enable ) wxOVERRIDE;
+    bool                ButtonClickDidStateChange() wxOVERRIDE { return true; }
+    void                SetMinimum( wxInt32 v ) wxOVERRIDE;
+    void                SetMaximum( wxInt32 v ) wxOVERRIDE;
+    wxInt32             GetMinimum() const wxOVERRIDE;
+    wxInt32             GetMaximum() const wxOVERRIDE;
+    void                PulseGauge() wxOVERRIDE;
+    void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE;
 
-    void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
-    void                SetToolTip( wxToolTip* tooltip );
+    void                SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack = true ) wxOVERRIDE;
+    void                SetToolTip( wxToolTip* tooltip ) wxOVERRIDE;
 
-    void                InstallEventHandler( WXWidget control = NULL );
-    bool                EnableTouchEvents(int eventsMask);
+    void                InstallEventHandler( WXWidget control = NULL ) wxOVERRIDE;
+    bool                EnableTouchEvents(int eventsMask) wxOVERRIDE;
 
     virtual bool        ShouldHandleKeyNavigation(const wxKeyEvent &event) const;
     bool                DoHandleKeyNavigation(const wxKeyEvent &event);
@@ -148,13 +148,21 @@ public :
     virtual bool        SetupCursor(NSEvent* event);
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
-    virtual void        PanGestureEvent(NSPanGestureRecognizer *panGestureRecognizer);
-    virtual void        ZoomGestureEvent(NSMagnificationGestureRecognizer *magnificationGestureRecognizer);
-    virtual void        RotateGestureEvent(NSRotationGestureRecognizer *rotationGestureRecognizer);
-    virtual void        LongPressEvent(NSPressGestureRecognizer *pressGestureRecognizer);
-    virtual void        TouchesBegan(NSEvent *event);
-    virtual void        TouchesMoved(NSEvent *event);
-    virtual void        TouchesEnded(NSEvent *event);
+    #ifdef API_AVAILABLE
+        #define WX_AVAILABLE_10_10 API_AVAILABLE(macos(10.10))
+    #else
+        #define WX_AVAILABLE_10_10
+    #endif
+
+    WX_AVAILABLE_10_10 virtual void        PanGestureEvent(NSPanGestureRecognizer *panGestureRecognizer);
+    WX_AVAILABLE_10_10 virtual void        ZoomGestureEvent(NSMagnificationGestureRecognizer *magnificationGestureRecognizer);
+    WX_AVAILABLE_10_10 virtual void        RotateGestureEvent(NSRotationGestureRecognizer *rotationGestureRecognizer);
+    WX_AVAILABLE_10_10 virtual void        LongPressEvent(NSPressGestureRecognizer *pressGestureRecognizer);
+    WX_AVAILABLE_10_10 virtual void        TouchesBegan(NSEvent *event);
+    WX_AVAILABLE_10_10 virtual void        TouchesMoved(NSEvent *event);
+    WX_AVAILABLE_10_10 virtual void        TouchesEnded(NSEvent *event);
+
+    #undef WX_AVAILABLE_10_10
 #endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
 
 #if !wxOSX_USE_NATIVE_FLIPPED
@@ -162,7 +170,7 @@ public :
     virtual bool        IsFlipped() const { return m_isFlipped; }
 #endif
 
-    virtual double      GetContentScaleFactor() const;
+    virtual double      GetContentScaleFactor() const wxOVERRIDE;
 
     // cocoa thunk connected calls
 
@@ -242,7 +250,7 @@ public :
     void GetPosition( int &x, int &y ) const wxOVERRIDE;
     void GetSize( int &width, int &height ) const wxOVERRIDE;
 
-    void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE;
+    void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
     bool SetShape(const wxRegion& region) wxOVERRIDE;
 
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE;
@@ -304,13 +312,13 @@ class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
 {
 public:
     wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
-    virtual void SetBitmap(const wxBitmap& bitmap);
+    virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
 #if wxUSE_MARKUP
-    virtual void SetLabelMarkup(const wxString& markup);
+    virtual void SetLabelMarkup(const wxString& markup) wxOVERRIDE;
 #endif // wxUSE_MARKUP
 
-    void SetPressedBitmap( const wxBitmap& bitmap );
-    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
+    void SetPressedBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
+    void GetLayoutInset(int &left, int &top, int &right, int &bottom) const wxOVERRIDE;
     void SetAcceleratorFromLabel(const wxString& label);
 
     NSButton *GetNSButton() const;
diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h
index c46f2f5d0f..9d3518caf3 100644
--- a/include/wx/osx/colordlg.h
+++ b/include/wx/osx/colordlg.h
@@ -27,7 +27,7 @@ public:
 
     bool Create(wxWindow *parent, wxColourData *data = NULL);
 
-    int ShowModal();
+    int ShowModal() wxOVERRIDE;
     wxColourData& GetColourData() { return m_colourData; }
 
 protected:
diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 95de0449d4..35eb85a66c 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -82,53 +82,53 @@ class WXDLLIMPEXP_CORE wxComboBox :
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
-    virtual int GetSelection() const;
-    virtual void GetSelection(long *from, long *to) const;
-    virtual void SetSelection(int n);
-    virtual void SetSelection(long from, long to);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual wxString GetStringSelection() const;
-    virtual void SetString(unsigned int n, const wxString& s);
+    virtual int GetSelection() const wxOVERRIDE;
+    virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
+    virtual void SetSelection(int n) wxOVERRIDE;
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
+    virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
+    virtual wxString GetString(unsigned int n) const wxOVERRIDE;
+    virtual wxString GetStringSelection() const wxOVERRIDE;
+    virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
 
-    virtual unsigned int GetCount() const;
+    virtual unsigned int GetCount() const wxOVERRIDE;
 
-    virtual void SetValue(const wxString& value);
+    virtual void SetValue(const wxString& value) wxOVERRIDE;
 // these methods are provided by wxTextEntry for the native impl.
 
 #if wxOSX_USE_COCOA
-    virtual void Popup();
-    virtual void Dismiss();
+    virtual void Popup() wxOVERRIDE;
+    virtual void Dismiss() wxOVERRIDE;
 #endif // wxOSX_USE_COCOA
 
 
     // osx specific event handling common for all osx-ports
 
-    virtual bool        OSXHandleClicked( double timestampsec );
+    virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE;
 
 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;
 #endif
 protected:
     // List functions
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
+    virtual void DoClear() wxOVERRIDE;
 
     // wxTextEntry functions
-    virtual wxWindow *GetEditableWindow() { return this; }
+    virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
 
     // override the base class virtuals involved in geometry calculations
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
-                              void **clientData, wxClientDataType type);
+                              void **clientData, wxClientDataType type) wxOVERRIDE;
 
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void * DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
+    virtual void * DoGetItemClientData(unsigned int n) const wxOVERRIDE;
 
 
-    virtual void EnableTextChangedEvents(bool enable);
+    virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE;
 
     // the subcontrols
     wxComboBoxText*     m_text;
diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index 6e667fdd24..e259e928e7 100644
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -36,7 +36,7 @@ public:
             const wxString& name = wxControlNameStr);
 
    // Simulates an event
-   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
+   virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); }
 
    // implementation from now on
    // --------------------------
diff --git a/include/wx/osx/core/evtloop.h b/include/wx/osx/core/evtloop.h
index c2be89e33b..01e1155205 100644
--- a/include/wx/osx/core/evtloop.h
+++ b/include/wx/osx/core/evtloop.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -25,22 +25,22 @@ public:
 
     // sets the "should exit" flag and wakes up the loop so that it terminates
     // soon
-    virtual void ScheduleExit(int rc = 0);
+    virtual void ScheduleExit(int rc = 0) wxOVERRIDE;
 
     // return true if any events are available
-    virtual bool Pending() const;
+    virtual bool Pending() const wxOVERRIDE;
 
     // dispatch a single event, return false if we should exit from the loop
-    virtual bool Dispatch();
+    virtual bool Dispatch() wxOVERRIDE;
 
     // same as Dispatch() but doesn't wait for longer than the specified (in
     // ms) timeout, return true if an event was processed, false if we should
     // exit the loop or -1 if timeout expired
-    virtual int DispatchTimeout(unsigned long timeout);
+    virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
 
     // implement this to wake up the loop: usually done by posting a dummy event
     // to it (can be called from non main thread)
-    virtual void WakeUp();
+    virtual void WakeUp() wxOVERRIDE;
 
     bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
 
@@ -53,13 +53,13 @@ public:
 protected:
     // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
     // terminating when Exit() is called
-    virtual int DoRun();
+    virtual int DoRun() wxOVERRIDE;
 
     // may be overridden to perform some action at the start of each new event
     // loop iteration
     virtual void OnNextIteration() {}
 
-    virtual void DoYieldFor(long eventsToProcess);
+    virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE;
 
     void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
     void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
diff --git a/include/wx/osx/core/hid.h b/include/wx/osx/core/hid.h
index 20c1a7ba41..7446b0df31 100644
--- a/include/wx/osx/core/hid.h
+++ b/include/wx/osx/core/hid.h
@@ -104,7 +104,7 @@ public:
     static int GetCount();
     bool Create(int nDev = 1);
     void AddCookie(CFTypeRef Data, int i);
-    virtual void BuildCookies(CFArrayRef Array);
+    virtual void BuildCookies(CFArrayRef Array) wxOVERRIDE;
     void DoBuildCookies(CFArrayRef Array);
 };
 
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index dfe47f4efd..bfdd0abb2a 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -1013,6 +1013,83 @@ void wxMacCocoaRelease( void* obj );
 void wxMacCocoaAutorelease( void* obj );
 void* wxMacCocoaRetain( void* obj );
 
+// shared_ptr like API for NSObject and subclasses
+template <class T>
+class wxNSObjRef
+{
+public:
+    typedef T element_type;
+
+    wxNSObjRef()
+        : m_ptr(NULL)
+    {
+    }
+
+    wxNSObjRef( T p )
+        : m_ptr(p)
+    {
+    }
+
+    wxNSObjRef( const wxNSObjRef& otherRef )
+        : m_ptr(wxMacCocoaRetain(otherRef.m_ptr))
+    {
+    }
+
+    wxNSObjRef& operator=( const wxNSObjRef& otherRef )
+    {
+        if (this != &otherRef)
+        {
+            wxMacCocoaRetain(otherRef.m_ptr);
+            wxMacCocoaRelease(m_ptr);
+            m_ptr = otherRef.m_ptr;
+        }
+        return *this;
+    }
+    
+    wxNSObjRef& operator=( T ptr )
+    {
+        if (get() != ptr)
+        {
+            wxMacCocoaRetain(ptr);
+            wxMacCocoaRelease(m_ptr);
+            m_ptr = ptr;
+        }
+        return *this;
+    }
+
+
+    T get() const
+    {
+        return m_ptr;
+    }
+
+    operator T() const
+    {
+        return m_ptr;
+    }
+
+    T operator->() const
+    {
+        return m_ptr;
+    }
+
+    void reset( T p = NULL )
+    {
+        wxMacCocoaRelease(m_ptr);
+        m_ptr = p; // Automatic conversion should occur
+    }
+
+    // Release the pointer, i.e. give up its ownership.
+    T release()
+    {
+        T p = m_ptr;
+        m_ptr = NULL;
+        return p;
+    }
+
+protected:
+    T m_ptr;
+};
 
 #endif
     // _WX_PRIVATE_CORE_H_
diff --git a/include/wx/osx/core/private/strconv_cf.h b/include/wx/osx/core/private/strconv_cf.h
index d22c73f72f..d9b3eda989 100644
--- a/include/wx/osx/core/private/strconv_cf.h
+++ b/include/wx/osx/core/private/strconv_cf.h
@@ -320,10 +320,10 @@ public:
         m_encoding = encoding ;
     }
 
-    virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const;
-    virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const;
+    virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const wxOVERRIDE;
+    virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const wxOVERRIDE;
 
-    virtual wxMBConv *Clone() const { return new wxMBConv_cf(*this); }
+    virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_cf(*this); }
 
     bool IsOk() const
     {
diff --git a/include/wx/osx/core/private/timer.h b/include/wx/osx/core/private/timer.h
index 2f191797d9..c23f9553ba 100644
--- a/include/wx/osx/core/private/timer.h
+++ b/include/wx/osx/core/private/timer.h
@@ -20,10 +20,10 @@ public:
     wxOSXTimerImpl(wxTimer *timer);
     virtual ~wxOSXTimerImpl();
 
-    virtual bool Start(int milliseconds = -1, bool one_shot = false);
-    virtual void Stop();
+    virtual bool Start(int milliseconds = -1, bool one_shot = false) wxOVERRIDE;
+    virtual void Stop() wxOVERRIDE;
 
-    virtual bool IsRunning() const;
+    virtual bool IsRunning() const wxOVERRIDE;
 
 private:
     wxOSXTimerInfo *m_info;
diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h
index 7af9a4176c..37e221f6ce 100644
--- a/include/wx/osx/cursor.h
+++ b/include/wx/osx/cursor.h
@@ -36,8 +36,8 @@ public:
     WXHCURSOR GetHCURSOR() 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;
 
 private:
     void InitFromStock(wxStockCursor);
diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h
index dec7fe50bf..f495c153f1 100644
--- a/include/wx/osx/dataobj2.h
+++ b/include/wx/osx/dataobj2.h
@@ -26,24 +26,24 @@ public:
     virtual ~wxBitmapDataObject();
 
     // override base class virtual to update PNG data too
-    virtual void SetBitmap(const wxBitmap& bitmap);
+    virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
 
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual size_t GetDataSize() const ;
-    virtual bool GetDataHere(void *buf) const ;
-    virtual bool SetData(size_t len, const void *buf);
+    virtual size_t GetDataSize() const wxOVERRIDE;
+    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
+    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
+    virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
     {
         return SetData(len, buf);
     }
@@ -68,19 +68,19 @@ public:
 
     void AddFile( const wxString &filename );
 
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
+    virtual size_t GetDataSize() const wxOVERRIDE;
+    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
+    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
+    virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
     {
         return SetData(len, buf);
     }
diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index 2eb826b5c4..836581e2a8 100644
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -42,29 +42,29 @@ public:
     virtual ~wxDataViewColumn();
 
     // implement wxHeaderColumnBase pure virtual methods
-    virtual wxAlignment GetAlignment() const { return m_alignment; }
-    virtual int GetFlags() const { return m_flags; }
+    virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_alignment; }
+    virtual int GetFlags() const wxOVERRIDE { return m_flags; }
     virtual int GetMaxWidth() const { return m_maxWidth; }
-    virtual int GetMinWidth() const { return m_minWidth; }
-    virtual wxString GetTitle() const { return m_title; }
-    virtual int GetWidth() const;
-    virtual bool IsSortOrderAscending() const { return m_ascending; }
-    virtual bool IsSortKey() const;
-    virtual bool IsHidden() const;
+    virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; }
+    virtual wxString GetTitle() const wxOVERRIDE { return m_title; }
+    virtual int GetWidth() const wxOVERRIDE;
+    virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_ascending; }
+    virtual bool IsSortKey() const wxOVERRIDE;
+    virtual bool IsHidden() const wxOVERRIDE;
 
-    virtual void SetAlignment  (wxAlignment align);
-    virtual void SetBitmap     (wxBitmap const& bitmap);
-    virtual void SetFlags      (int flags) { m_flags = flags; /*SetIndividualFlags(flags); */ }
-    virtual void SetHidden     (bool hidden);
+    virtual void SetAlignment  (wxAlignment align) wxOVERRIDE;
+    virtual void SetBitmap     (wxBitmap const& bitmap) wxOVERRIDE;
+    virtual void SetFlags      (int flags) wxOVERRIDE { m_flags = flags; /*SetIndividualFlags(flags); */ }
+    virtual void SetHidden     (bool hidden) wxOVERRIDE;
     virtual void SetMaxWidth   (int maxWidth);
-    virtual void SetMinWidth   (int minWidth);
-    virtual void SetReorderable(bool reorderable);
-    virtual void SetResizeable (bool resizable);
-    virtual void UnsetAsSortKey();
-    virtual void SetSortable   (bool sortable);
-    virtual void SetSortOrder  (bool ascending);
-    virtual void SetTitle      (wxString const& title);
-    virtual void SetWidth      (int  width);
+    virtual void SetMinWidth   (int minWidth) wxOVERRIDE;
+    virtual void SetReorderable(bool reorderable) wxOVERRIDE;
+    virtual void SetResizeable (bool resizable) wxOVERRIDE;
+    virtual void UnsetAsSortKey() wxOVERRIDE;
+    virtual void SetSortable   (bool sortable) wxOVERRIDE;
+    virtual void SetSortOrder  (bool ascending) wxOVERRIDE;
+    virtual void SetTitle      (wxString const& title) wxOVERRIDE;
+    virtual void SetWidth      (int  width) wxOVERRIDE;
 
    // implementation only
     wxDataViewColumnNativeData* GetNativeData() const
diff --git a/include/wx/osx/datectrl.h b/include/wx/osx/datectrl.h
index 555ba68e99..6d37c201a1 100644
--- a/include/wx/osx/datectrl.h
+++ b/include/wx/osx/datectrl.h
@@ -42,10 +42,10 @@ public:
                 const wxString& name = wxDatePickerCtrlNameStr);
 
     // Implement the base class pure virtuals.
-    virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2);
-    virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
+    virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE;
+    virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE;
 
-    virtual void OSXGenerateEvent(const wxDateTime& dt);
+    virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl);
diff --git a/include/wx/osx/datetimectrl.h b/include/wx/osx/datetimectrl.h
index 9993970125..9117c70510 100644
--- a/include/wx/osx/datetimectrl.h
+++ b/include/wx/osx/datetimectrl.h
@@ -20,8 +20,8 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase
 {
 public:
     // Implement the base class pure virtuals.
-    virtual void SetValue(const wxDateTime& dt);
-    virtual wxDateTime GetValue() const;
+    virtual void SetValue(const wxDateTime& dt) wxOVERRIDE;
+    virtual wxDateTime GetValue() const wxOVERRIDE;
 
     // Implementation only.
     virtual void OSXGenerateEvent(const wxDateTime& dt) = 0;
diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index 4c88220d9e..ae85550165 100644
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -28,8 +28,8 @@ public:
     wxWindowDCImpl( wxDC *owner, wxWindow *window );
     virtual ~wxWindowDCImpl();
 
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
+    virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
 
 protected:
     bool m_release;
diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 05fccf5075..787e2a6e92 100644
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -22,14 +22,14 @@ public:
 
     virtual ~wxMemoryDCImpl();
 
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
+    virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE
        { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
-    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
 
-    virtual const wxBitmap& GetSelectedBitmap() const
+    virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE
         { return m_selected; }
-    virtual wxBitmap& GetSelectedBitmap()
+    virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE
         { return m_selected; }
 
 private:
diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h
index 7bebfbc37c..4fa6de4f9d 100644
--- a/include/wx/osx/dcprint.h
+++ b/include/wx/osx/dcprint.h
@@ -25,18 +25,18 @@ public:
     wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata );
     virtual ~wxPrinterDCImpl();
 
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
-    virtual void EndDoc(void) ;
-    virtual void StartPage(void) ;
-    virtual void EndPage(void) ;
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE;
+    virtual void EndDoc(void) wxOVERRIDE;
+    virtual void StartPage(void) wxOVERRIDE;
+    virtual void EndPage(void) wxOVERRIDE;
 
-    wxRect GetPaperRect() const;
+    wxRect GetPaperRect() const wxOVERRIDE;
 
     wxPrintData& GetPrintData() { return m_printData; }
-    virtual wxSize GetPPI() const;
+    virtual wxSize GetPPI() const wxOVERRIDE;
 
 protected:
-    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
 
     wxPrintData        m_printData ;
     wxNativePrinterDC* m_nativePrinterDC ;
diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index c6fdd335a2..77d7832f70 100644
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -20,7 +20,7 @@ public:
     wxScreenDCImpl( wxDC *owner );
     virtual ~wxScreenDCImpl();
 
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
 private:
     void* m_overlayWindow;
 
diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index e8d871cd54..2e0c7a847f 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -46,18 +46,18 @@ public:
     virtual ~wxDialog();
 
 //    virtual bool Destroy();
-    virtual bool Show(bool show = true);
+    virtual bool Show(bool show = true) wxOVERRIDE;
 
     // return true if we're showing the dialog modally
-    virtual bool IsModal() const;
+    virtual bool IsModal() const wxOVERRIDE;
 
     // show the dialog modally and return the value passed to EndModal()
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
-    virtual void ShowWindowModal();
+    virtual void ShowWindowModal() wxOVERRIDE;
 
     // may be called to terminate the dialog with the given return code
-    virtual void EndModal(int retCode);
+    virtual void EndModal(int retCode) wxOVERRIDE;
 
     static bool OSXHasModalDialogsOpen();
     void OSXBeginModalDialog();
@@ -71,7 +71,7 @@ public:
     // implementation
     // --------------
 
-    wxDialogModality GetModality() const;
+    wxDialogModality GetModality() const wxOVERRIDE;
 
 #if wxOSX_USE_COCOA
     virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
@@ -85,7 +85,7 @@ protected:
     void EndWindowModal();
 
     // mac also takes command-period as cancel
-    virtual bool IsEscapeKey(const wxKeyEvent& event);
+    virtual bool IsEscapeKey(const wxKeyEvent& event) wxOVERRIDE;
 
 
     wxDialogModality m_modality;
diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index c23cf71bf5..a77cd0f880 100644
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -45,11 +45,11 @@ public:
     ~wxDirDialog();
 #endif
 
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
 #if wxOSX_USE_COCOA
-    virtual void ShowWindowModal();
-    virtual void ModalFinishedCallback(void* panel, int returnCode);
+    virtual void ShowWindowModal() wxOVERRIDE;
+    virtual void ModalFinishedCallback(void* panel, int returnCode) wxOVERRIDE;
 #endif
 
 private:
diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index 7cd8ed2242..b81679d7dd 100644
--- a/include/wx/osx/dnd.h
+++ b/include/wx/osx/dnd.h
@@ -50,10 +50,10 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
 
     wxDropTarget(wxDataObject *dataObject = NULL );
 
-    virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    virtual bool OnDrop(wxCoord x, wxCoord y);
-    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
-    virtual bool GetData();
+    virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE;
+    virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE;
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE;
+    virtual bool GetData() wxOVERRIDE;
     // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.
     virtual wxDataFormat GetMatchingPair();
 
@@ -90,7 +90,7 @@ public:
 
     // do it (call this in response to a mouse button press, for example)
     // params: if bAllowMove is false, data can be only copied
-    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE;
 
     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; }
diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h
index 1c6b5b5687..1b8231eebf 100644
--- a/include/wx/osx/dvrenderers.h
+++ b/include/wx/osx/dvrenderers.h
@@ -29,9 +29,9 @@ public:
     // implementation only
     // -------------------
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
-    virtual wxDC* GetDC(); // creates a device context and keeps it
+    virtual wxDC* GetDC() wxOVERRIDE; // creates a device context and keeps it
     void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 
 private:
@@ -82,11 +82,11 @@ public:
     void EnableMarkup(bool enable = true);
 #endif // wxUSE_MARKUP && Cocoa
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
-                                  unsigned col);
+                                  unsigned col) wxOVERRIDE;
 
 private:
 #if wxUSE_MARKUP && wxOSX_USE_COCOA
@@ -110,7 +110,7 @@ public:
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                              int align = wxDVR_DEFAULT_ALIGNMENT);
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
@@ -128,14 +128,14 @@ public:
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                              int alignment = wxDVR_DEFAULT_ALIGNMENT );
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
     wxString GetChoice(size_t index) const { return m_choices[index]; }
     const wxArrayString& GetChoices() const { return m_choices; }
 
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
-                                  unsigned col);
+                                  unsigned col) wxOVERRIDE;
 
 private:
     wxArrayString m_choices;
@@ -174,11 +174,11 @@ public:
                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                                int align = wxDVR_DEFAULT_ALIGNMENT);
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
-                                  unsigned col);
+                                  unsigned col) wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
@@ -200,11 +200,11 @@ public:
 
     void ShowAsRadio();
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
-                                  unsigned col);
+                                  unsigned col) wxOVERRIDE;
 
 private:
     void DoInitButtonCell(int buttonType);
@@ -226,11 +226,11 @@ public:
                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                                int align = wxDVR_DEFAULT_ALIGNMENT);
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
-                                  unsigned col);
+                                  unsigned col) wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
@@ -249,11 +249,11 @@ public:
                            wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
                            int align = wxDVR_DEFAULT_ALIGNMENT);
 
-    virtual bool MacRender();
+    virtual bool MacRender() wxOVERRIDE;
 
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
-                                  unsigned col);
+                                  unsigned col) wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer);
diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index e9e7545f18..af53115391 100644
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -6,7 +6,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -26,11 +26,11 @@ public:
 
 #ifdef __WXOSX_COCOA__
     // skip wxGUIEventLoop to avoid missing Enter/Exit notifications
-    virtual int Run() { return wxCFEventLoop::Run(); }
+    virtual int Run() wxOVERRIDE { return wxCFEventLoop::Run(); }
 #endif
 protected:
-    virtual void OSXDoRun();
-    virtual void OSXDoStop();
+    virtual void OSXDoRun() wxOVERRIDE;
+    virtual void OSXDoStop() wxOVERRIDE;
 
     // (in case) the modal window for this event loop
     wxNonOwnedWindow* m_modalWindow;
diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index e106a48629..892bad58f6 100644
--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -60,17 +60,17 @@ public:
     ~wxFileDialog();
 #endif
 
-    virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
-    virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
+    virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE { paths = m_paths; }
+    virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE { files = m_fileNames ; }
 
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
 #if wxOSX_USE_COCOA
-    virtual void ShowWindowModal();
-    virtual void ModalFinishedCallback(void* panel, int resultCode);
+    virtual void ShowWindowModal() wxOVERRIDE;
+    virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE;
 #endif
 
-    virtual bool SupportsExtraControl() const;
+    virtual bool SupportsExtraControl() const wxOVERRIDE;
 
     // implementation only
 
@@ -83,7 +83,7 @@ protected:
     // not supported for file dialog, RR
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
+                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {}
 
     void SetupExtraControls(WXWindow nativeWindow);
 
diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h
index 817501e39b..1ac7112e32 100644
--- a/include/wx/osx/fontdlg.h
+++ b/include/wx/osx/fontdlg.h
@@ -41,7 +41,7 @@ public:
     bool Create(wxWindow *parent);
     bool Create(wxWindow *parent, const wxFontData& data);
 
-    int ShowModal();
+    int ShowModal() wxOVERRIDE;
     wxFontData& GetFontData() { return m_fontData; }
 
 protected:
diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index cfd9ff5ce4..c4d22dbfa1 100644
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -39,11 +39,11 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
            const wxString& name = wxGaugeNameStr);
 
     // set gauge range/value
-    virtual void SetRange(int range);
-    virtual void SetValue(int pos);
-    virtual int  GetValue() const ;
+    virtual void SetRange(int range) wxOVERRIDE;
+    virtual void SetValue(int pos) wxOVERRIDE;
+    virtual int  GetValue() const  wxOVERRIDE;
 
-    void Pulse();
+    void Pulse() wxOVERRIDE;
 
  protected:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge);
diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index e1948c2f70..7f12f246fd 100644
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -43,7 +43,7 @@ public:
                 const wxGLContextAttrs *ctxAttrs = NULL);
     virtual ~wxGLContext();
 
-    virtual bool SetCurrent(const wxGLCanvas& win) const;
+    virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE;
 
     // Mac-specific
     WXGLContext GetWXGLContext() const { return m_glContext; }
diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index 2882c2eff9..3581f5611e 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -91,8 +91,6 @@ public:
     virtual ~wxListBox();
 
     // implement base class pure virtuals
-    virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE;
-
     virtual unsigned int GetCount() const wxOVERRIDE;
     virtual wxString GetString(unsigned int n) const wxOVERRIDE;
     virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
deleted file mode 100644
index 652af605f0..0000000000
--- a/include/wx/osx/listctrl.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/listctrl.h
-// Purpose:     wxListCtrl class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTCTRL_H_
-#define _WX_LISTCTRL_H_
-
-#include "wx/defs.h"
-#include "wx/generic/listctrl.h"
-
-#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
-
-class wxMacDataBrowserListCtrlControl;
-class wxListCtrlTextCtrlWrapper;
-class wxListCtrlRenameTimer;
-
-WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
-
-class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
-{
-    wxDECLARE_DYNAMIC_CLASS(wxListCtrl);
-public:
-  /*
-   * Public interface
-   */
-
-    wxListCtrl() { Init(); }
-
-    wxListCtrl(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxLC_ICON,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxListCtrlNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    virtual ~wxListCtrl();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListCtrlNameStr);
-
-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////
-
-  // Gets information about this column
-  bool GetColumn(int col, wxListItem& item) const;
-
-  // Sets information about this column
-  bool SetColumn(int col, const wxListItem& item) ;
-
-  // Gets the column width
-  int GetColumnWidth(int col) const;
-
-  // Sets the column width
-  bool SetColumnWidth(int col, int width) ;
-
-  // Gets the number of items that can fit vertically in the
-  // visible area of the list control (list or report view)
-  // or the total number of items in the list control (icon
-  // or small icon view)
-  int GetCountPerPage() const;
-
-  // Gets the edit control for editing labels.
-  wxTextCtrl* GetEditControl() const;
-
-  // Gets information about the item
-  bool GetItem(wxListItem& info) const ;
-
-  // Sets information about the item
-  bool SetItem(wxListItem& info) ;
-
-  // Sets a string field at a particular column
-  long SetItem(long index, int col, const wxString& label, int imageId = -1);
-
-  // Gets the item state
-  int  GetItemState(long item, long stateMask) const ;
-
-  // Sets the item state
-  bool SetItemState(long item, long state, long stateMask) ;
-
-  void AssignImageList(wxImageList *imageList, int which);
-
-  // Sets the item image
-  bool SetItemImage(long item, int image, int selImage = -1) ;
-  bool SetItemColumnImage(long item, long column, int image);
-
-  // Gets the item text
-  wxString GetItemText(long item, int col = 0) const ;
-
-  // Sets the item text
-  void SetItemText(long item, const wxString& str) ;
-
-  void SetItemTextColour(long item, const wxColour& colour) ;
-  wxColour GetItemTextColour(long item) const;
-
-  void SetItemBackgroundColour(long item, const wxColour& colour) ;
-  wxColour GetItemBackgroundColour(long item) const;
-
-  void SetItemFont( long item, const wxFont &f);
-  wxFont GetItemFont( long item ) const;
-
-  // Gets the item data
-  long GetItemData(long item) const ;
-
-  // Sets the item data
-  bool SetItemPtrData(long item, wxUIntPtr data);
-  bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }
-
-  // Gets the item rectangle
-  bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
-
-  // Gets the item rectangle of a subitem
-  bool GetSubItemRect( long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const;
-
-  // Gets the item position
-  bool GetItemPosition(long item, wxPoint& pos) const ;
-
-  // Sets the item position
-  bool SetItemPosition(long item, const wxPoint& pos) ;
-
-  // Gets the number of items in the list control
-  int GetItemCount() const;
-
-  // Gets the number of columns in the list control
-  int GetColumnCount() const;
-
-  void SetItemSpacing( int spacing, bool isSmall = false );
-  wxSize GetItemSpacing() const;
-
-  // Gets the number of selected items in the list control
-  int GetSelectedItemCount() const;
-
-  wxRect GetViewRect() const;
-
-  // Gets the text colour of the listview
-  wxColour GetTextColour() const;
-
-  // Sets the text colour of the listview
-  void SetTextColour(const wxColour& col);
-
-  // Gets the index of the topmost visible item when in
-  // list or report view
-  long GetTopItem() const ;
-
-  // Add or remove a single window style
-  void SetSingleStyle(long style, bool add = true) ;
-
-  // Set the whole window style
-  void SetWindowStyleFlag(long style) ;
-
-  // Searches for an item, starting from 'item'.
-  // item can be -1 to find the first item that matches the
-  // specified flags.
-  // Returns the item or -1 if unsuccessful.
-  long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
-
-  // Gets one of the three image lists
-  wxImageList *GetImageList(int which) const ;
-
-  // Sets the image list
-  void SetImageList(wxImageList *imageList, int which) ;
-
-  // Operations
-  ////////////////////////////////////////////////////////////////////////////
-
-  // Arranges the items
-  bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
-
-  // Deletes an item
-  bool DeleteItem(long item);
-
-  // Deletes all items
-  bool DeleteAllItems() ;
-
-  // Deletes a column
-  bool DeleteColumn(int col);
-
-  // Deletes all columns
-  bool DeleteAllColumns();
-
-  // Clears items, and columns if there are any.
-  void ClearAll();
-
-  // Edit the label
-  wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
-
-  // End label editing, optionally cancelling the edit
-  bool EndEditLabel(bool cancel);
-
-  // Ensures this item is visible
-  bool EnsureVisible(long item) ;
-
-  // Find an item whose label matches this string, starting from the item after 'start'
-  // or the beginning if 'start' is -1.
-  long FindItem(long start, const wxString& str, bool partial = false);
-
-  // Find an item whose data matches this data, starting from the item after 'start'
-  // or the beginning if 'start' is -1.
-  long FindItem(long start, long data);
-
-  // Find an item nearest this position in the specified direction, starting from
-  // the item after 'start' or the beginning if 'start' is -1.
-  long FindItem(long start, const wxPoint& pt, int direction);
-
-  // Determines which item (if any) is at the specified point,
-  // giving details in 'flags' (see wxLIST_HITTEST_... flags above)
-  // Request the subitem number as well at the given coordinate.
-  long HitTest(const wxPoint& point, int& flags, long* ptrSubItem = NULL) const;
-
-  // Inserts an item, returning the index of the new item if successful,
-  // -1 otherwise.
-  // TOD: Should also have some further convenience functions
-  // which don't require setting a wxListItem object
-  long InsertItem(wxListItem& info);
-
-  // Insert a string item
-  long InsertItem(long index, const wxString& label);
-
-  // Insert an image item
-  long InsertItem(long index, int imageIndex);
-
-  // Insert an image/string item
-  long InsertItem(long index, const wxString& label, int imageIndex);
-
-  // Scrolls the list control. If in icon, small icon or report view mode,
-  // x specifies the number of pixels to scroll. If in list view mode, x
-  // specifies the number of columns to scroll.
-  // If in icon, small icon or list view mode, y specifies the number of pixels
-  // to scroll. If in report view mode, y specifies the number of lines to scroll.
-  bool ScrollList(int dx, int dy);
-
-  // Sort items.
-
-  // fn is a function which takes 3 long arguments: item1, item2, data.
-  // item1 is the long data associated with a first item (NOT the index).
-  // item2 is the long data associated with a second item (NOT the index).
-  // data is the same value as passed to SortItems.
-  // The return value is a negative number if the first item should precede the second
-  // item, a positive number of the second item should precede the first,
-  // or zero if the two items are equivalent.
-
-  // data is arbitrary data to be passed to the sort function.
-  bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
-
-  wxMacDataBrowserListCtrlControl* GetListPeer() const;
-
-    // these functions are only used for virtual list view controls, i.e. the
-    // ones with wxLC_VIRTUAL style
-
-    void SetItemCount(long count);
-    void RefreshItem(long item);
-    void RefreshItems(long itemFrom, long itemTo);
-
-    // 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;
-
-/* Why should we need this function? Leave for now.
- * We might need it because item data may have changed,
- * but the display needs refreshing (in string callback mode)
-  // Updates an item. If the list control has the wxLI_AUTO_ARRANGE style,
-  // the items will be rearranged.
-  bool Update(long item);
-*/
-
-  void Command(wxCommandEvent& event) { ProcessCommand(event); }
-
-  wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }
-  wxIntPtr GetCompareFuncData() { return m_compareFuncData; }
-
-
-  // public overrides needed for pimpl approach
-  virtual bool SetFont(const wxFont& font);
-  virtual bool SetForegroundColour(const wxColour& colour);
-  virtual bool SetBackgroundColour(const wxColour& colour);
-  virtual wxColour GetBackgroundColour() const;
-
-  virtual void Freeze ();
-  virtual void Thaw ();
-  virtual void Update ();
-
-  // functions for editing/timer
-  void OnRenameTimer();
-  bool OnRenameAccept(long itemEdit, const wxString& value);
-  void OnRenameCancelled(long itemEdit);
-
-  void ChangeCurrent(long current);
-  void ResetCurrent() { ChangeCurrent((long)-1); }
-  bool HasCurrent() const { return m_current != (long)-1; }
-
-  void OnLeftDown(wxMouseEvent& event);
-  void OnDblClick(wxMouseEvent& event);
-
-  void FinishEditing(wxTextCtrl *text)
-  {
-      delete text;
-      m_textctrlWrapper = NULL;
-      SetFocus();
-  }
-
-  virtual int GetScrollPos(int orient) const;
-
-  void OnRightDown(wxMouseEvent& event);
-  void OnMiddleDown(wxMouseEvent& event);
-  void OnChar(wxKeyEvent& event);
-  virtual void SetFocus();
-  void FireMouseEvent(wxEventType eventType, wxPoint position);
-
-  virtual void SetDropTarget( wxDropTarget *dropTarget );
-  virtual wxDropTarget* GetDropTarget() const;
-
-  // with CG, we need to get the context from an kEventControlDraw event
-  // unfortunately, the DataBrowser callbacks don't provide the context
-  // and we need it, so we need to set/remove it before and after draw
-  // events so we can access it in the callbacks.
-  void MacSetDrawingContext(void* context) { m_cgContext = context; }
-  void* MacGetDrawingContext() { return m_cgContext; }
-
-  virtual wxVisualAttributes GetDefaultAttributes() const
-  {
-      return GetClassDefaultAttributes(GetWindowVariant());
-  }
-
-  static wxVisualAttributes
-  GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
-protected:
-  // Implement base class pure virtual methods.
-  long DoInsertColumn(long col, const wxListItem& info);
-
-  // protected overrides needed for pimpl approach
-  virtual void DoSetSize(int x, int y,
-                         int width, int height,
-                         int sizeFlags = wxSIZE_AUTO);
-
-  long               m_current;
-  wxListCtrlTextCtrlWrapper *m_textctrlWrapper;
-  wxListCtrlRenameTimer *m_renameTimer;
-  // common part of all ctors
-  void Init();
-
-  wxGenericListCtrl* m_genericImpl;   // allow use of the generic impl.
-  wxMacDataBrowserListCtrlControl* m_dbImpl;
-  void*  m_macListCtrlEventHandler;
-  void*  m_cgContext;
-  wxListCtrlCompare m_compareFunc;
-  wxIntPtr m_compareFuncData;
-
-  wxTextCtrl*       m_textCtrl;        // The control used for editing a label
-  wxImageList *     m_imageListNormal; // The image list for normal icons
-  wxImageList *     m_imageListSmall;  // The image list for small icons
-  wxImageList *     m_imageListState;  // The image list state icons (not implemented yet)
-
-  wxColumnList      m_colsInfo; // for storing info about each column
-  wxColour          m_textColor;
-  wxColour          m_bgColor;
-
-  // keep track of whether or not we should delete the image list ourselves.
-  bool              m_ownsImageListNormal,
-                    m_ownsImageListSmall,
-                    m_ownsImageListState;
-
-  long              m_baseStyle;  // Basic Windows style flags, for recreation purposes
-  int               m_colCount;   // Windows doesn't have GetColumnCount so must
-                                  // keep track of inserted/deleted columns
-
-  int               m_count; // for virtual lists, store item count
-
-private:
-  int CalcColumnAutoWidth(int col) const;
-
-};
-
-#endif
-    // _WX_LISTCTRL_H_
diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h
index 2bca063802..ad6d5cc5fe 100644
--- a/include/wx/osx/mdi.h
+++ b/include/wx/osx/mdi.h
@@ -119,14 +119,14 @@ public:
     virtual ~wxMDIChildFrame();
 
     // un-override the base class override
-    virtual bool IsTopLevel() const { return true; }
+    virtual bool IsTopLevel() const wxOVERRIDE { return true; }
 
     // implement MDI operations
-    virtual void Activate();
+    virtual void Activate() wxOVERRIDE;
 
 
     // Mac OS activate event
-    virtual void MacActivate(long timestamp, bool activating);
+    virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE;
 
 protected:
     // common part of all ctors
@@ -142,10 +142,10 @@ public:
     virtual ~wxMDIClientWindow();
 
     virtual bool CreateClient(wxMDIParentFrame *parent,
-                              long style = wxVSCROLL | wxHSCROLL);
+                              long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
 
 protected:
-    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
 };
diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 2fee40e622..e03bfb58a3 100644
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -34,9 +34,9 @@ public:
 
     virtual ~wxMenu();
 
-    virtual void Break();
+    virtual void Break() wxOVERRIDE;
 
-    virtual void SetTitle(const wxString& title);
+    virtual void SetTitle(const wxString& title) wxOVERRIDE;
 
     bool ProcessCommand(wxCommandEvent& event);
 
@@ -73,9 +73,9 @@ protected:
     // that are expected in the app menu
     void DoRearrange() ;
 
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE;
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE;
+    virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE;
 
 private:
     // common part of all ctors
@@ -125,16 +125,16 @@ public:
     virtual ~wxMenuBar();
 
     // menubar construction
-    virtual bool Append( wxMenu *menu, const wxString &title );
-    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Remove(size_t pos);
+    virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE;
+    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
+    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
+    virtual wxMenu *Remove(size_t pos) wxOVERRIDE;
 
-    virtual void EnableTop( size_t pos, bool flag );
-    virtual bool IsEnabledTop(size_t pos) const;
-    virtual void SetMenuLabel( size_t pos, const wxString& label );
-    virtual wxString GetMenuLabel( size_t pos ) const;
-    virtual bool Enable( bool enable = true );
+    virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE;
+    virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE;
+    virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE;
+    virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE;
+    virtual bool Enable( bool enable = true ) wxOVERRIDE;
     // for virtual function hiding
     virtual void Enable( int itemid, bool enable )
     {
@@ -142,18 +142,15 @@ public:
     }
 
     // implementation from now on
-    void Detach();
 
         // returns TRUE if we're attached to a frame
     bool IsAttached() const { return m_menuBarFrame != NULL; }
         // get the frame we live in
     wxFrame *GetFrame() const { return m_menuBarFrame; }
-        // attach to a frame
-    void Attach(wxFrame *frame);
 
     // if the menubar is modified, the display is not updated automatically,
     // call this function to update it (m_menuBarFrame should be !NULL)
-    void Refresh(bool eraseBackground = true, const wxRect *rect = NULL);
+    void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE;
 
 #if wxABI_VERSION >= 30001
     wxMenu *OSXGetAppleMenu() const { return m_appleMenu; }
@@ -171,9 +168,9 @@ public:
 
     static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
 
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
+    virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
+    virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
 
 protected:
     // common part of all ctors
diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 371b790b40..803739b647 100644
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -37,10 +37,10 @@ public:
     virtual ~wxMenuItem();
 
     // override base class virtuals
-    virtual void SetItemLabel(const wxString& strName);
+    virtual void SetItemLabel(const wxString& strName) wxOVERRIDE;
 
-    virtual void Enable(bool bDoEnable = true);
-    virtual void Check(bool bDoCheck = true);
+    virtual void Enable(bool bDoEnable = true) wxOVERRIDE;
+    virtual void Check(bool bDoCheck = true) wxOVERRIDE;
 
     virtual void SetBitmap(const wxBitmap& bitmap) ;
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 1851a08cad..c76b6c810d 100644
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -56,8 +56,8 @@ public:
     WXHMETAFILE GetHMETAFILE() const ;
     void SetHMETAFILE(WXHMETAFILE mf) ;
 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;
 
     wxDECLARE_DYNAMIC_CLASS(wxMetafile);
 };
@@ -81,7 +81,7 @@ public:
     void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
 
 protected:
-    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
 
     wxMetafile*   m_metaFile;
 
@@ -149,17 +149,17 @@ public:
         { return m_metafile; }
 
     // implement base class pure virtuals
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
+    virtual size_t GetDataSize() const wxOVERRIDE;
+    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
+    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
 
-    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
+    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
         { return GetDataSize(); }
     virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
-                             void *buf) const
+                             void *buf) const wxOVERRIDE
         { return GetDataHere(buf); }
     virtual bool SetData(const wxDataFormat& WXUNUSED(format),
-                         size_t len, const void *buf)
+                         size_t len, const void *buf) wxOVERRIDE
         { return SetData(len, buf); }
 protected:
   wxMetafile   m_metafile;
diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index 4d6e9d6a87..61fa9d1422 100644
--- a/include/wx/osx/msgdlg.h
+++ b/include/wx/osx/msgdlg.h
@@ -25,18 +25,18 @@ public:
     ~wxMessageDialog();
 #endif
 
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
 #if wxOSX_USE_COCOA
-    virtual void ShowWindowModal();
-    virtual void ModalFinishedCallback(void* panel, int resultCode);
+    virtual void ShowWindowModal() wxOVERRIDE;
+    virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE;
 #endif
 
 protected:
     // not supported for message dialog
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
+                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {}
 
 #if wxOSX_USE_COCOA
     void* ConstructNSAlert();
diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 41c9ca0492..af2c7bf3ed 100644
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -63,16 +63,16 @@ public:
     virtual void SubclassWin(WXWindow nativeWindow);
     virtual void UnsubclassWin();
 
-    virtual wxPoint GetClientAreaOrigin() const;
+    virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
 
     // implement base class pure virtuals
 
-    virtual bool SetTransparent(wxByte alpha);
-    virtual bool CanSetTransparent();
+    virtual bool SetTransparent(wxByte alpha) wxOVERRIDE;
+    virtual bool CanSetTransparent() wxOVERRIDE;
 
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
 
-    virtual void Update();
+    virtual void Update() wxOVERRIDE;
 
     WXWindow GetWXWindow() const ;
     static wxNonOwnedWindow* GetFromWXWindow( WXWindow win );
@@ -90,21 +90,21 @@ public:
     static void MacDelayedDeactivation(long timestamp);
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;
 
-    virtual void SetWindowStyleFlag(long flags);
+    virtual void SetWindowStyleFlag(long flags) wxOVERRIDE;
 
-    virtual void Raise();
-    virtual void Lower();
-    virtual bool Show( bool show = true );
+    virtual void Raise() wxOVERRIDE;
+    virtual void Lower() wxOVERRIDE;
+    virtual bool Show( bool show = true ) wxOVERRIDE;
 
-    virtual void SetExtraStyle(long exStyle) ;
+    virtual void SetExtraStyle(long exStyle) wxOVERRIDE;
 
-    virtual bool SetBackgroundColour( const wxColour &colour );
+    virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
 
     wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     // override the base class method to return an NSWindow instead of NSView
-    virtual void *OSXGetViewOrWindow() const;
+    virtual void *OSXGetViewOrWindow() const wxOVERRIDE;
 #endif // Cocoa
 
     // osx specific event handling common for all osx-ports
@@ -120,25 +120,25 @@ public:
 
     void WindowWasPainted();
 
-    virtual bool Destroy();
+    virtual bool Destroy() wxOVERRIDE;
 
 protected:
     // common part of all ctors
     void Init();
 
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
+    virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
+    virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
+    virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
 
     virtual bool OSXShowWithEffect(bool show,
                                    wxShowEffect effect,
-                                   unsigned timeout);
+                                   unsigned timeout) wxOVERRIDE;
 
-    virtual bool DoClearShape();
-    virtual bool DoSetRegionShape(const wxRegion& region);
+    virtual bool DoClearShape() wxOVERRIDE;
+    virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE;
 #if wxUSE_GRAPHICS_CONTEXT
-    virtual bool DoSetPathShape(const wxGraphicsPath& path);
+    virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE;
 #endif // wxUSE_GRAPHICS_CONTEXT
 
     virtual void WillBeDestroyed();
diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h
index 7c695ec1c9..982d88180a 100644
--- a/include/wx/osx/palette.h
+++ b/include/wx/osx/palette.h
@@ -27,11 +27,11 @@ public:
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
-    virtual int GetColoursCount() const;
+    virtual int GetColoursCount() const wxOVERRIDE;
 
 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(wxPalette);
diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h
index f028df68e9..9136793dea 100644
--- a/include/wx/osx/pen.h
+++ b/include/wx/osx/pen.h
@@ -32,25 +32,25 @@ public:
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
     // Override in order to recreate the pen
-    void SetColour(const wxColour& col) ;
-    void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
+    void SetColour(const wxColour& col) wxOVERRIDE;
+    void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
 
-    void SetWidth(int width)  ;
-    void SetStyle(wxPenStyle style)  ;
-    void SetStipple(const wxBitmap& stipple)  ;
-    void SetDashes(int nb_dashes, const wxDash *dash)  ;
-    void SetJoin(wxPenJoin join)  ;
-    void SetCap(wxPenCap cap)  ;
+    void SetWidth(int width) wxOVERRIDE;
+    void SetStyle(wxPenStyle style) wxOVERRIDE;
+    void SetStipple(const wxBitmap& stipple)  wxOVERRIDE;
+    void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE;
+    void SetJoin(wxPenJoin join) wxOVERRIDE;
+    void SetCap(wxPenCap cap) wxOVERRIDE;
 
-    wxColour GetColour() const ;
-    int GetWidth() const;
-    wxPenStyle GetStyle() const;
-    wxPenJoin GetJoin() const;
-    wxPenCap GetCap() const;
-    int GetDashes(wxDash **ptr) const;
+    wxColour GetColour() const wxOVERRIDE;
+    int GetWidth() const wxOVERRIDE;
+    wxPenStyle GetStyle() const wxOVERRIDE;
+    wxPenJoin GetJoin() const wxOVERRIDE;
+    wxPenCap GetCap() const wxOVERRIDE;
+    int GetDashes(wxDash **ptr) const wxOVERRIDE;
     int GetDashCount() const;
 
-    wxBitmap *GetStipple() const ;
+    wxBitmap *GetStipple() const wxOVERRIDE;
 
 
     wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
@@ -65,8 +65,8 @@ public:
     bool RealizeResource();
 
 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:
     void Unshare();
diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index 8d9be37dee..4bed655b40 100644
--- a/include/wx/osx/popupwin.h
+++ b/include/wx/osx/popupwin.h
@@ -26,7 +26,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual bool Show(bool show = true);
+    virtual bool Show(bool show = true) wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
 };
diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h
index 83fbd58dde..ffaf775200 100644
--- a/include/wx/osx/printdlg.h
+++ b/include/wx/osx/printdlg.h
@@ -33,11 +33,11 @@ public:
     virtual ~wxMacPrintDialog();
 
     bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
-    virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
-    virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
-    virtual wxDC *GetPrintDC();
+    virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; }
+    virtual wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); }
+    virtual wxDC *GetPrintDC() wxOVERRIDE;
 
 private:
     wxPrintDialogData   m_printDialogData;
@@ -60,10 +60,10 @@ public:
     wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
     virtual ~wxMacPageSetupDialog();
 
-    virtual wxPageSetupDialogData& GetPageSetupDialogData();
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE;
 
     bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
 private:
     wxPageSetupDialogData   m_pageSetupData;
@@ -86,7 +86,7 @@ class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
 public:
     wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data);
     bool TransferToWindow();
-    bool TransferDataFromWindow();
+    bool TransferDataFromWindow() wxOVERRIDE;
 
     virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }
 
diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h
index caf4aca61b..403e6fa1ab 100644
--- a/include/wx/osx/printmac.h
+++ b/include/wx/osx/printmac.h
@@ -27,9 +27,9 @@ public:
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
-                       bool prompt = true);
-    virtual wxDC* PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
+                       bool prompt = true) wxOVERRIDE;
+    virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE;
+    virtual bool Setup(wxWindow *parent) wxOVERRIDE;
 
 };
 
@@ -51,8 +51,8 @@ public:
                           wxPrintData *data);
     virtual ~wxMacPrintPreview();
 
-  virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
+    virtual bool Print(bool interactive) wxOVERRIDE;
+    virtual void DetermineScaling() wxOVERRIDE;
 };
 
 #endif
diff --git a/include/wx/osx/private/available.h b/include/wx/osx/private/available.h
new file mode 100644
index 0000000000..5ec95f5a06
--- /dev/null
+++ b/include/wx/osx/private/available.h
@@ -0,0 +1,34 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/private/available.h
+// Purpose:     Helper for checking API availability under macOS.
+// Author:      Vadim Zeitlin
+// Created:     2019-04-17
+// Copyright:   (c) 2019 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_OSX_PRIVATE_AVAILABLE_H_
+#define _WX_OSX_PRIVATE_AVAILABLE_H_
+
+// Xcode 9 adds new @available keyword and the corresponding __builtin_available
+// builtin which should be used instead of manually checks for API availability
+// as using this builtin suppresses the compiler -Wunguarded-availability
+// warnings, so use it if possible for the implementation of our own macro.
+#if defined(__clang__) && __has_builtin(__builtin_available)
+    #define WX_IS_MACOS_AVAILABLE(major, minor) \
+        __builtin_available(macOS major ## . ## minor, *)
+
+    // Note that we can't easily forward to API_AVAILABLE macro here, so go
+    // directly to its expansion instead.
+    #define WX_API_AVAILABLE_MACOS(major, minor) \
+         __attribute__((availability(macos,introduced=major ## . ## minor)))
+#else // Not clang or old clang version without __builtin_available
+    #include "wx/platinfo.h"
+
+    #define WX_IS_MACOS_AVAILABLE(major, minor) \
+        wxPlatformInfo::Get().CheckOSVersion(major, minor)
+
+    #define WX_API_AVAILABLE_MACOS(major, minor)
+#endif
+
+#endif // _WX_OSX_PRIVATE_AVAILABLE_H_
diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index 3b4aedb265..c147241dbe 100644
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -74,9 +74,6 @@ public:
     virtual wxString GetString(unsigned int item) const wxOVERRIDE;
     virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE;
 
-    virtual wxString GetLabel() const wxOVERRIDE;
-    virtual void SetLabel(const wxString& label) wxOVERRIDE;
-
     // protect native font of box
     virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
 // Other external functions
diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 714d1984e9..73291b8d02 100644
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -40,14 +40,14 @@ public:
 
     // implementation
 
-    void Command(wxCommandEvent& event);
+    void Command(wxCommandEvent& event) wxOVERRIDE;
     wxRadioButton *AddInCycle(wxRadioButton *cycle);
     void RemoveFromCycle();
     wxRadioButton *NextInCycle() {return m_cycle;}
 
     // osx specific event handling common for all osx-ports
 
-    virtual bool        OSXHandleClicked( double timestampsec );
+    virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE;
   protected:
 
     wxRadioButton *m_cycle;
diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index fffde4d3ee..848da62e72 100644
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -81,7 +81,6 @@ protected:
 
     virtual wxSize DoGetBestSize() const wxOVERRIDE;
     virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE;
-    virtual void   DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE;
 
     // set min/max size of the slider
     virtual void DoSetSizeHints( int minW, int minH,
diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h
index 43edc4855a..e9b9c27e02 100644
--- a/include/wx/osx/sound.h
+++ b/include/wx/osx/sound.h
@@ -64,7 +64,7 @@ public:
     static void SoundStopped(const wxSoundData* data);
 
 protected:
-    bool    DoPlay(unsigned flags) const;
+    bool    DoPlay(unsigned flags) const wxOVERRIDE;
     void    Init();
 
 private:
diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index e8b48f3f89..8b7c5b843c 100644
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -51,22 +51,22 @@ public:
 
 
     // accessors
-    virtual void SetRange(int minVal, int maxVal);
-    virtual int GetValue() const ;
-    virtual void SetValue(int val);
+    virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
+    virtual int GetValue() const wxOVERRIDE;
+    virtual void SetValue(int val) wxOVERRIDE;
 
     // implementation
 
-    virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
+    virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE;
 
     // osx specific event handling common for all osx-ports
 
-    virtual bool OSXHandleClicked( double timestampsec );
+    virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
 
 protected:
     void         SendThumbTrackEvent() ;
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index 981d2c3fdb..364c478fd2 100644
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -34,15 +34,15 @@ public:
            long style = 0,
            const wxString& name = wxStaticBoxNameStr);
 
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) wxOVERRIDE {}
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
 
-    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
 
-    virtual bool AcceptsFocus() const { return false; }
+    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
 
     // protect native font of box
-    virtual bool SetFont( const wxFont &font );
+    virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
 };
 
 #endif
diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index 28c89a05d8..45249da560 100644
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -34,20 +34,20 @@ public:
            const wxString& name = wxStaticTextNameStr);
 
   // accessors
-  void SetLabel( const wxString &str ) ;
-  bool SetFont( const wxFont &font );
+  void SetLabel( const wxString &str ) wxOVERRIDE;
+  bool SetFont( const wxFont &font ) wxOVERRIDE;
 
-    virtual bool AcceptsFocus() const { return false; }
+    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
 
 protected :
 
-    virtual wxString DoGetLabel() const;
-    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const wxOVERRIDE;
+    virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
 
-  virtual wxSize DoGetBestSize() const ;
+  virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 #if wxUSE_MARKUP && wxOSX_USE_COCOA
-    virtual bool DoSetLabelMarkup(const wxString& markup);
+    virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
 #endif // wxUSE_MARKUP && wxOSX_USE_COCOA
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 2512c753fb..96ee937dc1 100644
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -99,7 +99,6 @@ public:
     // --------------
     virtual void Command(wxCommandEvent& event) wxOVERRIDE;
 
-    virtual bool AcceptsFocus() const wxOVERRIDE;
     virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
 
     // callbacks
diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h
index 29939d8383..4a563a29db 100644
--- a/include/wx/osx/textentry.h
+++ b/include/wx/osx/textentry.h
@@ -34,58 +34,58 @@ public:
     wxTextEntry();
     virtual ~wxTextEntry();
 
-    virtual bool IsEditable() const;
+    virtual bool IsEditable() const wxOVERRIDE;
 
     // If the return values from and to are the same, there is no selection.
-    virtual void GetSelection(long* from, long* to) const;
+    virtual void GetSelection(long* from, long* to) const wxOVERRIDE;
 
     // operations
     // ----------
 
     // editing
-    virtual void Clear();
-    virtual void Remove(long from, long to);
+    virtual void Clear() wxOVERRIDE;
+    virtual void Remove(long from, long to) wxOVERRIDE;
 
     // set the max number of characters which may be entered
     // in a single line text control
-    virtual void SetMaxLength(unsigned long len);
+    virtual void SetMaxLength(unsigned long len) wxOVERRIDE;
 
-    virtual void ForceUpper();
+    virtual void ForceUpper() wxOVERRIDE;
 
     // writing text inserts it at the current position;
     // appending always inserts it at the end
-    virtual void WriteText(const wxString& text);
+    virtual void WriteText(const wxString& text) wxOVERRIDE;
 
     // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
+    virtual void Copy() wxOVERRIDE;
+    virtual void Cut() wxOVERRIDE;
+    virtual void Paste() wxOVERRIDE;
 
-    virtual bool CanCopy() const;
-    virtual bool CanCut() const;
-    virtual bool CanPaste() const;
+    virtual bool CanCopy() const wxOVERRIDE;
+    virtual bool CanCut() const wxOVERRIDE;
+    virtual bool CanPaste() const wxOVERRIDE;
 
     // Undo/redo
-    virtual void Undo();
-    virtual void Redo();
+    virtual void Undo() wxOVERRIDE;
+    virtual void Redo() wxOVERRIDE;
 
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
+    virtual bool CanUndo() const wxOVERRIDE;
+    virtual bool CanRedo() const wxOVERRIDE;
 
     // Insertion point
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
+    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
+    virtual void SetInsertionPointEnd() wxOVERRIDE;
+    virtual long GetInsertionPoint() const wxOVERRIDE;
+    virtual wxTextPos GetLastPosition() const wxOVERRIDE;
 
-    virtual void SetSelection(long from, long to);
-    virtual void SetEditable(bool editable);
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
+    virtual void SetEditable(bool editable) wxOVERRIDE;
 
     virtual bool SendMaxLenEvent();
 
     // set the grayed out hint text
-    virtual bool SetHint(const wxString& hint);
-    virtual wxString GetHint() const;
+    virtual bool SetHint(const wxString& hint) wxOVERRIDE;
+    virtual wxString GetHint() const wxOVERRIDE;
 
     // Implementation
     // --------------
@@ -95,10 +95,10 @@ public:
 
 protected:
 
-    virtual wxString DoGetValue() const;
+    virtual wxString DoGetValue() const wxOVERRIDE;
 
-    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
-    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
+    virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE;
+    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
 
     // The object providing auto-completions or NULL if none.
     wxTextCompleter *m_completer;
diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 1283d33f6c..8f7697b334 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -37,15 +37,15 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxCheckBoxNameStr);
 
-    virtual void SetValue(bool value);
-    virtual bool GetValue() const ;
+    virtual void SetValue(bool value) wxOVERRIDE;
+    virtual bool GetValue() const wxOVERRIDE;
 
-    virtual bool OSXHandleClicked( double timestampsec );
+    virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
 
-    virtual void Command(wxCommandEvent& event);
+    virtual void Command(wxCommandEvent& event) wxOVERRIDE;
 
 protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton);
diff --git a/include/wx/osx/timectrl.h b/include/wx/osx/timectrl.h
index 6673fcce38..4cce4e9b43 100644
--- a/include/wx/osx/timectrl.h
+++ b/include/wx/osx/timectrl.h
@@ -41,7 +41,7 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxTimePickerCtrlNameStr);
 
-    virtual void OSXGenerateEvent(const wxDateTime& dt);
+    virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl);
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 32730fb613..7e43bc37fa 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -160,11 +160,13 @@ private:
 
     OSXWebViewPtr m_webView;
 
+    WX_NSObject m_loadDelegate;
+    WX_NSObject m_policyDelegate;
+    WX_NSObject m_UIDelegate;
+
     // we may use this later to setup our own mouse events,
     // so leave it in for now.
     void* m_webKitCtrlEventHandler;
-    //It should be WebView*, but WebView is an Objective-C class
-    //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory
diff --git a/include/wx/platform.h b/include/wx/platform.h
index 45bb9cc3aa..47c1c4778c 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -611,7 +611,11 @@
         Only 4.3 defines __GXX_RTTI by default so its absence is not an
         indication of disabled RTTI with the previous versions.
      */
-#   if wxCHECK_GCC_VERSION(4, 3)
+#   if defined(__clang__)
+#       if !__has_feature(cxx_rtti)
+#           define wxNO_RTTI
+#       endif
+#   elif wxCHECK_GCC_VERSION(4, 3)
 #       ifndef __GXX_RTTI
 #           define wxNO_RTTI
 #       endif
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index e8c0dd9242..dfde0635ad 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -152,6 +152,8 @@ public:
                                   WXLPARAM lParam) wxOVERRIDE;
 
 private:
+    void DismissOnDeactivate();
+
     wxDECLARE_DYNAMIC_CLASS(wxPopupTransientWindow);
     wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow);
 };
diff --git a/include/wx/power.h b/include/wx/power.h
index 7de0b207f7..ccddf1bba5 100644
--- a/include/wx/power.h
+++ b/include/wx/power.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/private/display.h b/include/wx/private/display.h
index 15668eaaf8..e7358f6e18 100644
--- a/include/wx/private/display.h
+++ b/include/wx/private/display.h
@@ -3,7 +3,7 @@
 // Purpose:     wxDisplayImpl class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-03-15
-// Copyright:   (c) 2002-2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2002-2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -49,7 +49,7 @@ public:
     virtual int GetFromWindow(const wxWindow *window);
 
     // Trigger recreation of wxDisplayImpl when they're needed the next time.
-    void InvalidateCache() { ClearImpls(); }
+    virtual void InvalidateCache() { ClearImpls(); }
 
 protected:
     // create a new display object
diff --git a/include/wx/private/streamtempinput.h b/include/wx/private/streamtempinput.h
index df937cf574..8a0401cd8b 100644
--- a/include/wx/private/streamtempinput.h
+++ b/include/wx/private/streamtempinput.h
@@ -6,7 +6,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Rob Bresalier
 // Created:     2013-05-04
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 342d42e816..555d4ded3d 100644
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -344,6 +344,7 @@ public:
                                int argFlags = 0) const wxOVERRIDE;
     virtual bool OnEvent( wxPropertyGrid* propgrid,
                           wxWindow* primary, wxEvent& event ) wxOVERRIDE;
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
 
     wxArrayInt GetValueAsArrayInt() const
     {
@@ -361,6 +362,8 @@ protected:
 
     // Cache displayed text since generating it is relatively complicated.
     wxString            m_display;
+    // How to handle user strings
+    int                 m_userStringMode;
 };
 
 #endif // wxUSE_CHOICEDLG
diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index c9c8dddd31..f224386661 100644
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -428,7 +428,7 @@ public:
     virtual bool DoShowDialog( wxPropertyGrid* propGrid,
                                wxPGProperty* property ) = 0;
 
-    void SetValue( wxVariant value )
+    void SetValue( const wxVariant& value )
     {
         m_value = value;
     }
diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index c83d421191..bac5e33895 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -543,8 +543,8 @@ protected:
 #endif
     void OnResize( wxSizeEvent& event );
     void OnPropertyGridSelect( wxPropertyGridEvent& event );
-    void OnPGColDrag( wxPropertyGridEvent& event );
     void OnPGScrollH(wxPropertyGridEvent& evt);
+    void OnColWidthsChanged(wxPropertyGridEvent& evt);
 
 
     wxPropertyGrid* m_pPropGrid;
diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 77d8c4b09a..e7f0e7e48e 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -291,8 +291,11 @@ class WXDLLIMPEXP_PROPGRID wxPGAttributeStorage
 {
 public:
     wxPGAttributeStorage();
+    wxPGAttributeStorage(const wxPGAttributeStorage& other);
     ~wxPGAttributeStorage();
 
+    wxPGAttributeStorage& operator=(const wxPGAttributeStorage& rhs);
+
     void Set( const wxString& name, const wxVariant& value );
     unsigned int GetCount() const { return (unsigned int) m_map.size(); }
     wxVariant FindValue( const wxString& name ) const
@@ -971,7 +974,6 @@ class WXDLLIMPEXP_PROPGRID wxPGProperty : public wxObject
     friend class wxPropertyGridInterface;
     friend class wxPropertyGridPageState;
     friend class wxPropertyGridPopulator;
-    friend class wxStringProperty;  // Proper "<composed>" support requires this
 
     wxDECLARE_ABSTRACT_CLASS(wxPGProperty);
 public:
@@ -1252,8 +1254,7 @@ public:
     // Common values are disabled by the default for all properties.
     void EnableCommonValue( bool enable = true )
     {
-        if ( enable ) SetFlag( wxPG_PROP_USES_COMMON_VALUE );
-        else ClearFlag( wxPG_PROP_USES_COMMON_VALUE );
+        ChangeFlag(wxPG_PROP_USES_COMMON_VALUE, enable);
     }
 
     // Composes text from values of child properties.
@@ -1354,7 +1355,7 @@ public:
     }
 
     // Returns property's hint text (shown in empty value cell).
-    inline wxString GetHintText() const;
+    wxString GetHintText() const;
 
     // Returns property grid where property lies.
     wxPropertyGrid* GetGrid() const;
@@ -1475,7 +1476,7 @@ public:
     // Returns true if this is a sub-property.
     bool IsSubProperty() const
     {
-        wxPGProperty* parent = (wxPGProperty*)m_parent;
+        wxPGProperty* parent = m_parent;
         if ( parent && !parent->IsCategory() )
             return true;
         return false;
@@ -1489,10 +1490,11 @@ public:
     // this function usually returns Null variant.
     wxVariant GetDefaultValue() const;
 
-    // Returns maximum allowed length of property's text value.
+    // Returns maximum allowed length of the text the user can enter in
+    // the property text editor.
     int GetMaxLength() const
     {
-        return (int) m_maxLen;
+        return m_maxLen;
     }
 
     // Determines, recursively, if all children are not unspecified.
@@ -1627,7 +1629,7 @@ public:
     }
 
     // Sets editor for a property, , by editor name.
-    inline void SetEditor( const wxString& editorName );
+    void SetEditor( const wxString& editorName );
 
     // Sets cell information for given column.
     void SetCell( int column, const wxPGCell& cell );
@@ -1679,8 +1681,7 @@ public:
 
     void SetExpanded( bool expanded )
     {
-        if ( !expanded ) m_flags |= wxPG_PROP_COLLAPSED;
-        else m_flags &= ~wxPG_PROP_COLLAPSED;
+        ChangeFlag(wxPG_PROP_COLLAPSED, !expanded);
     }
 
     // Sets or clears given property flag. Mainly for internal use.
@@ -1736,7 +1737,7 @@ public:
 
     // Helper function (for wxPython bindings and such) for settings protected
     // m_value.
-    void SetValuePlain( wxVariant value )
+    void SetValuePlain( const wxVariant& value )
     {
         m_value = value;
     }
@@ -1786,7 +1787,7 @@ public:
     bool SetChoices( const wxPGChoices& choices );
 
     // Set max length of text in text editor.
-    inline bool SetMaxLength( int maxLen );
+    bool SetMaxLength( int maxLen );
 
     // Call with 'false' in OnSetValue to cancel value changes after all
     // (i.e. cancel 'true' returned by StringToValue() or IntToValue()).
@@ -2038,11 +2039,10 @@ protected:
 
     FlagType                    m_flags;
 
-    // Maximum length (mainly for string properties). Could be in some sort of
+    // Maximum length (for string properties). Could be in some sort of
     // wxBaseStringProperty, but currently, for maximum flexibility and
-    // compatibility, we'll stick it here. Anyway, we had 3 excess bytes to use
-    // so short int will fit in just fine.
-    short                       m_maxLen;
+    // compatibility, we'll stick it here.
+    int                         m_maxLen;
 
     // Root has 0, categories etc. at that level 1, etc.
     unsigned char               m_depth;
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 68f6eab42c..6e061dce36 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -654,8 +654,7 @@ enum wxPG_INTERNAL_FLAGS
 // Use Freeze() and Thaw() respectively to disable and enable drawing. This
 // will also delay sorting etc. miscellaneous calculations to the last
 // possible moment.
-class WXDLLIMPEXP_PROPGRID wxPropertyGrid : public wxControl,
-                                            public wxScrollHelper,
+class WXDLLIMPEXP_PROPGRID wxPropertyGrid : public wxScrolled<wxControl>,
                                             public wxPropertyGridInterface
 {
     friend class wxPropertyGridEvent;
@@ -1299,7 +1298,7 @@ public:
     // changed after the function returns (with true as return value).
     // ValueChangeInEvent() must be used if you wish the application to be
     // able to use wxEVT_PG_CHANGING to potentially veto the given value.
-    void ValueChangeInEvent( wxVariant variant )
+    void ValueChangeInEvent( const wxVariant& variant )
     {
         m_changeInEventValue = variant;
         m_iFlags |= wxPG_FL_VALUE_CHANGE_IN_EVENT;
@@ -1948,63 +1947,6 @@ private:
     wxDECLARE_EVENT_TABLE();
 };
 
-// -----------------------------------------------------------------------
-//
-// Bunch of inlines that need to resolved after all classes have been defined.
-//
-
-inline bool wxPropertyGridPageState::IsDisplayed() const
-{
-    return ( this == m_pPropGrid->GetState() );
-}
-
-inline unsigned int wxPropertyGridPageState::GetActualVirtualHeight() const
-{
-    return DoGetRoot()->GetChildrenHeight(GetGrid()->GetRowHeight());
-}
-
-inline wxString wxPGProperty::GetHintText() const
-{
-    wxVariant vHintText = GetAttribute(wxPG_ATTR_HINT);
-
-#if wxPG_COMPATIBILITY_1_4
-    // Try the old, deprecated "InlineHelp"
-    if ( vHintText.IsNull() )
-        vHintText = GetAttribute(wxPG_ATTR_INLINE_HELP);
-#endif
-
-    if ( !vHintText.IsNull() )
-        return vHintText.GetString();
-
-    return wxEmptyString;
-}
-
-inline int wxPGProperty::GetDisplayedCommonValueCount() const
-{
-    if ( HasFlag(wxPG_PROP_USES_COMMON_VALUE) )
-    {
-        wxPropertyGrid* pg = GetGrid();
-        if ( pg )
-            return (int) pg->GetCommonValueCount();
-    }
-    return 0;
-}
-
-inline void wxPGProperty::SetDefaultValue( wxVariant& value )
-{
-    SetAttribute(wxPG_ATTR_DEFAULT_VALUE, value);
-}
-
-inline void wxPGProperty::SetEditor( const wxString& editorName )
-{
-    m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName);
-}
-
-inline bool wxPGProperty::SetMaxLength( int maxLen )
-{
-    return GetGrid()->SetPropertyMaxLength(this,maxLen);
-}
-
 // -----------------------------------------------------------------------
 
 #define wxPG_BASE_EVT_PRE_ID     1775
@@ -2030,7 +1972,9 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
                           wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
                           wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
+// Events used only internally
 wxDECLARE_EVENT(wxEVT_PG_HSCROLL, wxPropertyGridEvent);
+wxDECLARE_EVENT(wxEVT_PG_COLS_RESIZED, wxPropertyGridEvent);
 
 #else
     enum {
@@ -2203,7 +2147,7 @@ public:
             m_propertyName = p->GetName();
     }
 
-    void SetPropertyValue( wxVariant value )
+    void SetPropertyValue( const wxVariant& value )
     {
         m_value = value;
     }
diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index 1a18eccbac..717af47696 100644
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -400,16 +400,16 @@ enum wxPG_SETVALUE_FLAGS
 //
 // Valid constants for wxPG_UINT_BASE attribute
 // (long because of wxVariant constructor)
-#define wxPG_BASE_OCT                       (long)8
-#define wxPG_BASE_DEC                       (long)10
-#define wxPG_BASE_HEX                       (long)16
-#define wxPG_BASE_HEXL                      (long)32
+#define wxPG_BASE_OCT                       8L
+#define wxPG_BASE_DEC                       10L
+#define wxPG_BASE_HEX                       16L
+#define wxPG_BASE_HEXL                      32L
 
 //
 // Valid constants for wxPG_UINT_PREFIX attribute
-#define wxPG_PREFIX_NONE                    (long)0
-#define wxPG_PREFIX_0x                      (long)1
-#define wxPG_PREFIX_DOLLAR_SIGN             (long)2
+#define wxPG_PREFIX_NONE                    0L
+#define wxPG_PREFIX_0x                      1L
+#define wxPG_PREFIX_DOLLAR_SIGN             2L
 
 // -----------------------------------------------------------------------
 // Editor class.
@@ -517,7 +517,7 @@ class classname##VariantData: public wxVariantData \
 { \
 public:\
     classname##VariantData() {} \
-    classname##VariantData( const classname &value ) { m_value = value; } \
+    classname##VariantData( const classname &value ) : m_value(value) { } \
 \
     classname &GetValue() { return m_value; } \
 \
diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 246f23dec0..4285352d94 100644
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -354,14 +354,10 @@ protected:
 // should not use this class directly, but instead member functions in
 // wxPropertyGridInterface, wxPropertyGrid, wxPropertyGridPage, and
 // wxPropertyGridManager.
-// - In separate wxPropertyGrid component this class was known as
-// wxPropertyGridState.
 // - Currently this class is not implemented in wxPython.
 class WXDLLIMPEXP_PROPGRID wxPropertyGridPageState
 {
-    friend class wxPGProperty;
     friend class wxPropertyGrid;
-    friend class wxPGCanvas;
     friend class wxPropertyGridInterface;
     friend class wxPropertyGridPage;
     friend class wxPropertyGridManager;
@@ -424,7 +420,7 @@ public:
 
     // Returns actual height of contained visible properties.
     // Mostly used for internal diagnostic purposes.
-    inline unsigned int GetActualVirtualHeight() const;
+    unsigned int GetActualVirtualHeight() const;
 
     unsigned int GetColumnCount() const
     {
@@ -516,7 +512,7 @@ public:
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
 
     // Returns true if page is visibly displayed.
-    inline bool IsDisplayed() const;
+    bool IsDisplayed() const;
 
     bool IsInNonCatMode() const { return (bool)(m_properties == m_abcArray); }
 
diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 358e2891ca..2ea1fe6413 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -280,7 +280,6 @@ public:
                                 const wxString& text,
                                 int argFlags = 0 ) const wxOVERRIDE;
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
-    virtual wxVariant DoGetAttribute( const wxString& name ) const wxOVERRIDE;
 
     virtual bool ValidateValue( wxVariant& value,
                                 wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
@@ -317,7 +316,6 @@ public:
     virtual bool IntToValue( wxVariant& variant,
                              int number, int argFlags = 0 ) const wxOVERRIDE;
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value ) wxOVERRIDE;
-    virtual wxVariant DoGetAttribute( const wxString& name ) const wxOVERRIDE;
 };
 
 // -----------------------------------------------------------------------
@@ -586,11 +584,14 @@ public:
     wxFileName GetFileName() const;
 
 protected:
+    bool DisplayEditorDialog(wxPropertyGrid* propGrid, wxString& value);
+
     wxString    m_wildcard;
     wxString    m_basePath; // If set, then show path relative to it
     wxString    m_initialPath; // If set, start the file dialog here
     wxString    m_dlgTitle; // If set, used as title for file dialog
     int         m_indFilter; // index to the selected filter
+    long        m_dlgStyle;  // File dialog style
 };
 
 // -----------------------------------------------------------------------
@@ -665,7 +666,7 @@ protected:
 
 // -----------------------------------------------------------------------
 
-// wxBoolProperty specific flags
+// wxBoolProperty, wxFlagsProperty specific flags
 #define wxPG_PROP_USE_CHECKBOX      wxPG_PROP_CLASS_SPECIFIC_1
 // DCC = Double Click Cycles
 #define wxPG_PROP_USE_DCC           wxPG_PROP_CLASS_SPECIFIC_2
diff --git a/include/wx/qt/accel.h b/include/wx/qt/accel.h
index 3e53300030..a988ffe206 100644
--- a/include/wx/qt/accel.h
+++ b/include/wx/qt/accel.h
@@ -52,8 +52,8 @@ public:
 
 protected:
     // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxObjectRefData *CreateRefData() const wxOVERRIDE;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
diff --git a/include/wx/qt/anybutton.h b/include/wx/qt/anybutton.h
index eb3951aca7..85a8bb9cbe 100644
--- a/include/wx/qt/anybutton.h
+++ b/include/wx/qt/anybutton.h
@@ -23,9 +23,9 @@ public:
     // implementation
     // --------------
 
-    virtual void SetLabel( const wxString &label );
+    virtual void SetLabel( const wxString &label ) wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
     // implementation only
     void QtUpdateState();
diff --git a/include/wx/qt/app.h b/include/wx/qt/app.h
index 2c7d51ff97..b9f21141aa 100644
--- a/include/wx/qt/app.h
+++ b/include/wx/qt/app.h
@@ -18,7 +18,7 @@ public:
     wxApp();
     ~wxApp();
 
-    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
 
 private:
     wxScopedPtr<QApplication> m_qtApplication;
diff --git a/include/wx/qt/bitmap.h b/include/wx/qt/bitmap.h
index 0da96633da..afd121f980 100644
--- a/include/wx/qt/bitmap.h
+++ b/include/wx/qt/bitmap.h
@@ -36,34 +36,34 @@ public:
 
     static void InitStandardHandlers();
 
-    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;
     virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc));
 
-    virtual int GetHeight() const;
-    virtual int GetWidth() const;
-    virtual int GetDepth() const;
+    virtual int GetHeight() const wxOVERRIDE;
+    virtual int GetWidth() const wxOVERRIDE;
+    virtual int GetDepth() const wxOVERRIDE;
 
 #if wxUSE_IMAGE
-    virtual wxImage ConvertToImage() const;
+    virtual wxImage ConvertToImage() const wxOVERRIDE;
 #endif // wxUSE_IMAGE
 
-    virtual wxMask *GetMask() const;
-    virtual void SetMask(wxMask *mask);
+    virtual wxMask *GetMask() const wxOVERRIDE;
+    virtual void SetMask(wxMask *mask) wxOVERRIDE;
 
-    virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
+    virtual wxBitmap GetSubBitmap(const wxRect& rect) const wxOVERRIDE;
 
     virtual bool SaveFile(const wxString &name, wxBitmapType type,
-                          const wxPalette *palette = NULL) const;
-    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
+                          const wxPalette *palette = NULL) const wxOVERRIDE;
+    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE;
 
 #if wxUSE_PALETTE
-    virtual wxPalette *GetPalette() const;
-    virtual void SetPalette(const wxPalette& palette);
+    virtual wxPalette *GetPalette() const wxOVERRIDE;
+    virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
 #endif // wxUSE_PALETTE
 
     // 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;
 
     // implementation:
 #if WXWIN_COMPATIBILITY_3_0
@@ -82,8 +82,8 @@ public:
     QPixmap *GetHandle() 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;
 
     wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 };
@@ -114,10 +114,10 @@ public:
 
 protected:
     // this function is called from Create() to free the existing mask data
-    void FreeData();
+    void FreeData() wxOVERRIDE;
     // by the public wrappers
-    bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
-    bool InitFromMonoBitmap(const wxBitmap& bitmap);
+    bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE;
+    bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE;
 
     wxBitmap GetBitmap() const;
 
diff --git a/include/wx/qt/brush.h b/include/wx/qt/brush.h
index 60c116574f..b060ce7952 100644
--- a/include/wx/qt/brush.h
+++ b/include/wx/qt/brush.h
@@ -21,17 +21,17 @@ public:
 
     wxBrush(const wxBitmap& stipple);
 
-    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); }
 
-    virtual wxColour GetColour() const;
-    virtual wxBrushStyle GetStyle() const;
-    virtual wxBitmap *GetStipple() const;
+    virtual wxColour GetColour() const wxOVERRIDE;
+    virtual wxBrushStyle GetStyle() const wxOVERRIDE;
+    virtual wxBitmap *GetStipple() const wxOVERRIDE;
 
     wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
     void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
@@ -39,8 +39,8 @@ public:
     QBrush GetHandle() 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;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxBrush);
diff --git a/include/wx/qt/button.h b/include/wx/qt/button.h
index d1b11c1f51..3560267734 100644
--- a/include/wx/qt/button.h
+++ b/include/wx/qt/button.h
@@ -29,7 +29,7 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
-   virtual wxWindow *SetDefault();
+   virtual wxWindow *SetDefault() wxOVERRIDE;
 
     // implementation only
     virtual int GetEventType() const wxOVERRIDE { return wxEVT_BUTTON; }
diff --git a/include/wx/qt/calctrl.h b/include/wx/qt/calctrl.h
index c8c7595750..abdf32c31e 100644
--- a/include/wx/qt/calctrl.h
+++ b/include/wx/qt/calctrl.h
@@ -39,41 +39,41 @@ public:
                 long style = wxCAL_SHOW_HOLIDAYS,
                 const wxString& name = wxCalendarNameStr);
 
-    virtual bool SetDate(const wxDateTime& date);
-    virtual wxDateTime GetDate() const;
+    virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
+    virtual wxDateTime GetDate() const wxOVERRIDE;
 
     virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
-                              const wxDateTime& upperdate = wxDefaultDateTime);
-    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
+                              const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
+    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
 
-    virtual bool EnableMonthChange(bool enable = true);
-    virtual void Mark(size_t day, bool mark);
+    virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
+    virtual void Mark(size_t day, bool mark) wxOVERRIDE;
 
     // holidays colours
-    virtual void SetHoliday(size_t day);
-    virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg);
-    virtual const wxColour& GetHolidayColourFg() const { return m_colHolidayFg; }
-    virtual const wxColour& GetHolidayColourBg() const { return m_colHolidayBg; }
+    virtual void SetHoliday(size_t day) wxOVERRIDE;
+    virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE;
+    virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; }
+    virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; }
 
     // header colours
-    virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg);
-    virtual const wxColour& GetHeaderColourFg() const { return m_colHeaderFg; }
-    virtual const wxColour& GetHeaderColourBg() const { return m_colHeaderBg; }
+    virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE;
+    virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; }
+    virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; }
 
     // day attributes
-    virtual wxCalendarDateAttr *GetAttr(size_t day) const;
-    virtual void SetAttr(size_t day, wxCalendarDateAttr *attr);
-    virtual void ResetAttr(size_t day) { SetAttr(day, NULL); }
+    virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE;
+    virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE;
+    virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); }
 
 
-    virtual void SetWindowStyleFlag(long style);
+    virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
 
     using wxCalendarCtrlBase::GenerateAllChangeEvents;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
-    virtual void RefreshHolidays();
+    virtual void RefreshHolidays() wxOVERRIDE;
 
 private:
     void Init();
diff --git a/include/wx/qt/checkbox.h b/include/wx/qt/checkbox.h
index 82a28ec14f..ad59788c36 100644
--- a/include/wx/qt/checkbox.h
+++ b/include/wx/qt/checkbox.h
@@ -29,17 +29,17 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxCheckBoxNameStr );
 
-    virtual void SetValue(bool value);
-    virtual bool GetValue() const;
+    virtual void SetValue(bool value) wxOVERRIDE;
+    virtual bool GetValue() const wxOVERRIDE;
 
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
     virtual wxString GetLabel() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
-    virtual void DoSet3StateValue(wxCheckBoxState state);
-    virtual wxCheckBoxState DoGet3StateValue() const;
+    virtual void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE;
+    virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
 
 private:
     QCheckBox *m_qtCheckBox;
diff --git a/include/wx/qt/checklst.h b/include/wx/qt/checklst.h
index 93d9c09a27..243225acf1 100644
--- a/include/wx/qt/checklst.h
+++ b/include/wx/qt/checklst.h
@@ -46,11 +46,11 @@ public:
                   const wxValidator& validator = wxDefaultValidator,
                   const wxString& name = wxListBoxNameStr);
 
-    virtual bool IsChecked(unsigned int item) const;
-    virtual void Check(unsigned int item, bool check = true);
+    virtual bool IsChecked(unsigned int item) const wxOVERRIDE;
+    virtual void Check(unsigned int item, bool check = true) wxOVERRIDE;
 
 private:
-    virtual void Init(); //common construction
+    virtual void Init() wxOVERRIDE; //common construction
 
     wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
diff --git a/include/wx/qt/choice.h b/include/wx/qt/choice.h
index 5808879ea8..5e8b1b7888 100644
--- a/include/wx/qt/choice.h
+++ b/include/wx/qt/choice.h
@@ -47,29 +47,29 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
+    virtual unsigned int GetCount() const wxOVERRIDE;
+    virtual wxString GetString(unsigned int n) const wxOVERRIDE;
+    virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
 
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
+    virtual void SetSelection(int n) wxOVERRIDE;
+    virtual int GetSelection() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,
                               unsigned int pos,
                               void **clientData,
-                              wxClientDataType type);
-    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
+                              wxClientDataType type) wxOVERRIDE;
+    virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE;
 
-    virtual void DoSetItemClientData(unsigned int n, void *clientData);
-    virtual void *DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE;
+    virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE;
 
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int pos);
+    virtual void DoClear() wxOVERRIDE;
+    virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE;
 
     void QtInitSort(QComboBox *combo);
 
diff --git a/include/wx/qt/clipbrd.h b/include/wx/qt/clipbrd.h
index 1a0cb22bb2..d81d704676 100644
--- a/include/wx/qt/clipbrd.h
+++ b/include/wx/qt/clipbrd.h
@@ -18,16 +18,16 @@ public:
     wxClipboard();
     ~wxClipboard();
 
-    virtual bool Open();
-    virtual void Close();
-    virtual bool IsOpened() const;
+    virtual bool Open() wxOVERRIDE;
+    virtual void Close() wxOVERRIDE;
+    virtual bool IsOpened() const wxOVERRIDE;
 
-    virtual bool AddData( wxDataObject *data );
-    virtual bool SetData( wxDataObject *data );
-    virtual bool GetData( wxDataObject& data );
-    virtual void Clear();
-    virtual bool IsSupported( const wxDataFormat& format );
-    virtual bool IsSupportedAsync(wxEvtHandler *sink);
+    virtual bool AddData( wxDataObject *data ) wxOVERRIDE;
+    virtual bool SetData( wxDataObject *data ) wxOVERRIDE;
+    virtual bool GetData( wxDataObject& data ) wxOVERRIDE;
+    virtual void Clear() wxOVERRIDE;
+    virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE;
+    virtual bool IsSupportedAsync(wxEvtHandler *sink) wxOVERRIDE;
 
 private:
     friend class QtClipBoardSignalHandler;
diff --git a/include/wx/qt/clrpicker.h b/include/wx/qt/clrpicker.h
index 0ba5f0ea49..c3a9ea3096 100644
--- a/include/wx/qt/clrpicker.h
+++ b/include/wx/qt/clrpicker.h
@@ -42,7 +42,7 @@ public:
                 const wxString& name = wxColourPickerWidgetNameStr);
 
 protected:
-    virtual void UpdateColour();
+    virtual void UpdateColour() wxOVERRIDE;
 
 private:
 };
diff --git a/include/wx/qt/colour.h b/include/wx/qt/colour.h
index 52018c500d..f6d041f5fe 100644
--- a/include/wx/qt/colour.h
+++ b/include/wx/qt/colour.h
@@ -18,12 +18,12 @@ public:
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
     wxColour(const QColor& color);
 
-    virtual bool IsOk() const { return m_valid; }
+    virtual bool IsOk() const wxOVERRIDE { return m_valid; }
 
-    ChannelType Red() const   { return m_red;   }
-    ChannelType Green() const { return m_green; }
-    ChannelType Blue()  const { return m_blue;  }
-    ChannelType Alpha() const { return m_alpha; }
+    ChannelType Red()   const wxOVERRIDE { return m_red;   }
+    ChannelType Green() const wxOVERRIDE { return m_green; }
+    ChannelType Blue()  const wxOVERRIDE { return m_blue;  }
+    ChannelType Alpha() const wxOVERRIDE { return m_alpha; }
 
     bool operator==(const wxColour& color) const;
     bool operator!=(const wxColour& color) const;
@@ -34,7 +34,7 @@ public:
 
 protected:
     void Init();
-    virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
+    virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE;
 
 private:
     ChannelType m_red, m_green, m_blue, m_alpha;
diff --git a/include/wx/qt/control.h b/include/wx/qt/control.h
index be112cd036..189a2b0932 100644
--- a/include/wx/qt/control.h
+++ b/include/wx/qt/control.h
@@ -24,7 +24,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 protected:
     bool QtCreateControl( wxWindow *parent, wxWindowID id, const wxPoint &pos,
diff --git a/include/wx/qt/cursor.h b/include/wx/qt/cursor.h
index 218564e32d..92f0a7bc8c 100644
--- a/include/wx/qt/cursor.h
+++ b/include/wx/qt/cursor.h
@@ -27,7 +27,7 @@ public:
              int hotSpotX = 0, int hotSpotY = 0);
 #endif
 
-    virtual wxPoint GetHotSpot() const;
+    virtual wxPoint GetHotSpot() const wxOVERRIDE;
     QCursor &GetHandle() const;
 
 protected:
@@ -38,8 +38,8 @@ protected:
 
 private:
     void Init();
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
diff --git a/include/wx/qt/dc.h b/include/wx/qt/dc.h
index 76abb7a43b..94f3261780 100644
--- a/include/wx/qt/dc.h
+++ b/include/wx/qt/dc.h
@@ -19,73 +19,73 @@ public:
     wxQtDCImpl( wxDC *owner );
     ~wxQtDCImpl();
 
-    virtual bool CanDrawBitmap() const;
-    virtual bool CanGetTextExtent() const;
+    virtual bool CanDrawBitmap() const wxOVERRIDE;
+    virtual bool CanGetTextExtent() const wxOVERRIDE;
 
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
+    virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
+    virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
 
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
+    virtual int GetDepth() const wxOVERRIDE;
+    virtual wxSize GetPPI() const wxOVERRIDE;
 
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
+    virtual void SetFont(const wxFont& font) wxOVERRIDE;
+    virtual void SetPen(const wxPen& pen) wxOVERRIDE;
+    virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
+    virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
+    virtual void SetBackgroundMode(int mode) wxOVERRIDE;
 
 #if wxUSE_PALETTE
-    virtual void SetPalette(const wxPalette& palette);
+    virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
 #endif // wxUSE_PALETTE
 
-    virtual void SetLogicalFunction(wxRasterOperationMode function);
+    virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
 
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
+    virtual wxCoord GetCharHeight() const wxOVERRIDE;
+    virtual wxCoord GetCharWidth() const wxOVERRIDE;
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const wxOVERRIDE;
 
-    virtual void Clear();
+    virtual void Clear() wxOVERRIDE;
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height);
+                                     wxCoord width, wxCoord height) wxOVERRIDE;
 
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
-    virtual void DestroyClippingRegion();
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
+    virtual void DestroyClippingRegion() wxOVERRIDE;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE);
-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+                             wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
 
-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+    virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
                            wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc);
+                           wxCoord xc, wxCoord yc) wxOVERRIDE;
 
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                   double sa, double ea);
+                                   double sa, double ea) wxOVERRIDE;
 
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                         wxCoord width, wxCoord height,
-                                        double radius);
+                                        double radius) wxOVERRIDE;
     virtual void DoDrawEllipse(wxCoord x, wxCoord y,
-                               wxCoord width, wxCoord height);
+                               wxCoord width, wxCoord height) wxOVERRIDE;
 
-    virtual void DoCrossHair(wxCoord x, wxCoord y);
+    virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE;
 
-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = false);
+                              bool useMask = false) wxOVERRIDE;
 
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
     virtual void DoDrawRotatedText(const wxString& text,
-                                   wxCoord x, wxCoord y, double angle);
+                                   wxCoord x, wxCoord y, double angle) wxOVERRIDE;
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
@@ -94,21 +94,21 @@ public:
                         wxRasterOperationMode rop = wxCOPY,
                         bool useMask = false,
                         wxCoord xsrcMask = wxDefaultCoord,
-                        wxCoord ysrcMask = wxDefaultCoord);
+                        wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
 
     virtual void DoDrawLines(int n, const wxPoint points[],
-                             wxCoord xoffset, wxCoord yoffset );
+                             wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE;
 
     virtual void DoDrawPolygon(int n, const wxPoint points[],
                            wxCoord xoffset, wxCoord yoffset,
-                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
 
     // Use Qt transformations, as they automatically scale pen widths, text...
-    virtual void ComputeScaleAndOrigin();
+    virtual void ComputeScaleAndOrigin() wxOVERRIDE;
 
     void QtPreparePainter();
 
-    virtual void* GetHandle() const { return (void*) m_qtPainter; }
+    virtual void* GetHandle() const wxOVERRIDE { return (void*) m_qtPainter; }
 
 protected:
     virtual QPixmap *GetQPixmap() { return m_qtPixmap; }
diff --git a/include/wx/qt/dcmemory.h b/include/wx/qt/dcmemory.h
index 5f1e333cf6..9dddf6e8b4 100644
--- a/include/wx/qt/dcmemory.h
+++ b/include/wx/qt/dcmemory.h
@@ -18,11 +18,11 @@ public:
     wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
     ~wxMemoryDCImpl();
 
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
-    virtual void DoSelect(const wxBitmap& bitmap);
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
+    virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
 
-    virtual const wxBitmap& GetSelectedBitmap() const;
-    virtual wxBitmap& GetSelectedBitmap();
+    virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE;
+    virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE;
 
 private:
     wxBitmap m_selected;
diff --git a/include/wx/qt/dcprint.h b/include/wx/qt/dcprint.h
index 2c9dfce4f8..51b7bee533 100644
--- a/include/wx/qt/dcprint.h
+++ b/include/wx/qt/dcprint.h
@@ -15,72 +15,72 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl
 public:
     wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
 
-    virtual bool CanDrawBitmap() const;
-    virtual bool CanGetTextExtent() const;
+    virtual bool CanDrawBitmap() const wxOVERRIDE;
+    virtual bool CanGetTextExtent() const wxOVERRIDE;
 
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
+    virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
+    virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
 
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
+    virtual int GetDepth() const wxOVERRIDE;
+    virtual wxSize GetPPI() const wxOVERRIDE;
 
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
+    virtual void SetFont(const wxFont& font) wxOVERRIDE;
+    virtual void SetPen(const wxPen& pen) wxOVERRIDE;
+    virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
+    virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
+    virtual void SetBackgroundMode(int mode) wxOVERRIDE;
 
 #if wxUSE_PALETTE
-    virtual void SetPalette(const wxPalette& palette);
+    virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
 #endif // wxUSE_PALETTE
 
-    virtual void SetLogicalFunction(wxRasterOperationMode function);
+    virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
 
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
+    virtual wxCoord GetCharHeight() const wxOVERRIDE;
+    virtual wxCoord GetCharWidth() const wxOVERRIDE;
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const wxOVERRIDE;
 
-    virtual void Clear();
+    virtual void Clear() wxOVERRIDE;
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height);
+                                     wxCoord width, wxCoord height) wxOVERRIDE;
 
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE);
+                             wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
 
-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
 
-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+    virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
                            wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc);
+                           wxCoord xc, wxCoord yc) wxOVERRIDE;
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                   double sa, double ea);
+                                   double sa, double ea) wxOVERRIDE;
 
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                         wxCoord width, wxCoord height,
-                                        double radius);
+                                        double radius) wxOVERRIDE;
     virtual void DoDrawEllipse(wxCoord x, wxCoord y,
-                               wxCoord width, wxCoord height);
+                               wxCoord width, wxCoord height) wxOVERRIDE;
 
-    virtual void DoCrossHair(wxCoord x, wxCoord y);
+    virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE;
 
-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = false);
+                              bool useMask = false) wxOVERRIDE;
 
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
     virtual void DoDrawRotatedText(const wxString& text,
-                                   wxCoord x, wxCoord y, double angle);
+                                   wxCoord x, wxCoord y, double angle) wxOVERRIDE;
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
@@ -89,14 +89,14 @@ public:
                         wxRasterOperationMode rop = wxCOPY,
                         bool useMask = false,
                         wxCoord xsrcMask = wxDefaultCoord,
-                        wxCoord ysrcMask = wxDefaultCoord);
+                        wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
 
     virtual void DoDrawLines(int n, const wxPoint points[],
-                             wxCoord xoffset, wxCoord yoffset );
+                             wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE;
 
     virtual void DoDrawPolygon(int n, const wxPoint points[],
                            wxCoord xoffset, wxCoord yoffset,
-                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
 
 private:
     wxDECLARE_CLASS(wxPrinterDCImpl);
diff --git a/include/wx/qt/dnd.h b/include/wx/qt/dnd.h
index b497daf58e..a2e595ec57 100644
--- a/include/wx/qt/dnd.h
+++ b/include/wx/qt/dnd.h
@@ -46,7 +46,7 @@ public:
                  const wxCursor &move = wxNullCursor,
                  const wxCursor &none = wxNullCursor);
 
-    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE;
 
 private:
     wxWindow* m_parentWindow;
diff --git a/include/wx/qt/font.h b/include/wx/qt/font.h
index 391623dcb9..78535e6886 100644
--- a/include/wx/qt/font.h
+++ b/include/wx/qt/font.h
@@ -53,33 +53,33 @@ public:
     virtual int GetPointSize() const wxOVERRIDE;
     virtual float GetFractionalPointSize() const wxOVERRIDE;
     virtual wxSize GetPixelSize() const wxOVERRIDE;
-    virtual wxFontStyle GetStyle() const;
+    virtual wxFontStyle GetStyle() const wxOVERRIDE;
     virtual int GetNumericWeight() const wxOVERRIDE;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual bool GetUnderlined() const wxOVERRIDE;
+    virtual wxString GetFaceName() const wxOVERRIDE;
+    virtual wxFontEncoding GetEncoding() const wxOVERRIDE;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE;
     virtual bool GetStrikethrough() const wxOVERRIDE;
 
     // change the font characteristics
     virtual void SetFractionalPointSize(float pointSize) wxOVERRIDE;
     virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE;
-    virtual void SetFamily( wxFontFamily family );
-    virtual void SetStyle( wxFontStyle style );
+    virtual void SetFamily( wxFontFamily family ) wxOVERRIDE;
+    virtual void SetStyle( wxFontStyle style ) wxOVERRIDE;
     virtual void SetNumericWeight(int weight) wxOVERRIDE;
-    virtual bool SetFaceName(const wxString& facename);
-    virtual void SetUnderlined( bool underlined );
+    virtual bool SetFaceName(const wxString& facename) wxOVERRIDE;
+    virtual void SetUnderlined( bool underlined ) wxOVERRIDE;
     virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE;
-    virtual void SetEncoding(wxFontEncoding encoding);
+    virtual void SetEncoding(wxFontEncoding encoding) wxOVERRIDE;
 
     wxDECLARE_COMMON_FONT_METHODS();
 
     virtual QFont GetHandle() const;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-    virtual wxFontFamily DoGetFamily() const;
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
+    virtual wxFontFamily DoGetFamily() const wxOVERRIDE;
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxFont);
diff --git a/include/wx/qt/fontdlg.h b/include/wx/qt/fontdlg.h
index a170578ffa..91113b229d 100644
--- a/include/wx/qt/fontdlg.h
+++ b/include/wx/qt/fontdlg.h
@@ -18,7 +18,7 @@ public:
     wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
 
 protected:
-    bool DoCreate(wxWindow *parent);
+    bool DoCreate(wxWindow *parent) wxOVERRIDE;
 
 private:
 
diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h
index 4e164f3d26..4905911d79 100644
--- a/include/wx/qt/frame.h
+++ b/include/wx/qt/frame.h
@@ -42,20 +42,20 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual void SetMenuBar(wxMenuBar *menubar);
-    virtual void SetStatusBar(wxStatusBar *statusBar );
-    virtual void SetToolBar(wxToolBar *toolbar);
+    virtual void SetMenuBar(wxMenuBar *menubar) wxOVERRIDE;
+    virtual void SetStatusBar(wxStatusBar *statusBar ) wxOVERRIDE;
+    virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
 
-    virtual void SetWindowStyleFlag( long style );
+    virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
 
-    virtual void AddChild( wxWindowBase *child );
-    virtual void RemoveChild( wxWindowBase *child );
+    virtual void AddChild( wxWindowBase *child ) wxOVERRIDE;
+    virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE;
 
     QMainWindow *GetQMainWindow() const;
-    virtual QScrollArea *QtGetScrollBarsContainer() const;
+    virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
 
 protected:
-    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
 
 private:
     // Common part of all ctors.
diff --git a/include/wx/qt/gauge.h b/include/wx/qt/gauge.h
index fc59debbe8..a3e6d39db1 100644
--- a/include/wx/qt/gauge.h
+++ b/include/wx/qt/gauge.h
@@ -33,14 +33,14 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxGaugeNameStr);
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
     // set/get the control range
-    virtual void SetRange(int range);
-    virtual int GetRange() const;
+    virtual void SetRange(int range) wxOVERRIDE;
+    virtual int GetRange() const wxOVERRIDE;
 
-    virtual void SetValue(int pos);
-    virtual int GetValue() const;
+    virtual void SetValue(int pos) wxOVERRIDE;
+    virtual int GetValue() const wxOVERRIDE;
 
 private:
     QProgressBar *m_qtProgressBar;
diff --git a/include/wx/qt/glcanvas.h b/include/wx/qt/glcanvas.h
index 0e872e343f..08fc13b887 100644
--- a/include/wx/qt/glcanvas.h
+++ b/include/wx/qt/glcanvas.h
@@ -75,7 +75,7 @@ public:
                 const int *attribList = NULL,
                 const wxPalette& palette = wxNullPalette);
 
-    virtual bool SwapBuffers();
+    virtual bool SwapBuffers() wxOVERRIDE;
 
     static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format);
 
diff --git a/include/wx/qt/listbox.h b/include/wx/qt/listbox.h
index f3acc6eb5f..9ebaf91a66 100644
--- a/include/wx/qt/listbox.h
+++ b/include/wx/qt/listbox.h
@@ -52,13 +52,13 @@ public:
     virtual bool IsSelected(int n) const wxOVERRIDE;
     virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
 
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
+    virtual unsigned int GetCount() const wxOVERRIDE;
+    virtual wxString GetString(unsigned int n) const wxOVERRIDE;
+    virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
 
-    virtual int GetSelection() const;
+    virtual int GetSelection() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
     void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected);
 
@@ -70,16 +70,16 @@ protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,
                               unsigned int pos,
                               void **clientData,
-                              wxClientDataType type);
-    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
+                              wxClientDataType type) wxOVERRIDE;
+    virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE;
 
-    virtual void DoSetItemClientData(unsigned int n, void *clientData);
-    virtual void *DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE;
+    virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE;
 
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int pos);
+    virtual void DoClear() wxOVERRIDE;
+    virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE;
 
-    virtual QScrollArea *QtGetScrollBarsContainer() const;
+    virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
 
 #if wxUSE_CHECKLISTBOX
     bool       m_hasCheckBoxes;
diff --git a/include/wx/qt/listctrl.h b/include/wx/qt/listctrl.h
index 5d3a135fa7..e55b44ef98 100644
--- a/include/wx/qt/listctrl.h
+++ b/include/wx/qt/listctrl.h
@@ -42,20 +42,20 @@ public:
     ////////////////////////////////////////////////////////////////////////////
 
     // Set the control colours
-    bool SetForegroundColour(const wxColour& col);
-    bool SetBackgroundColour(const wxColour& col);
+    bool SetForegroundColour(const wxColour& col) wxOVERRIDE;
+    bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
 
     // Gets information about this column
-    bool GetColumn(int col, wxListItem& info) const;
+    bool GetColumn(int col, wxListItem& info) const wxOVERRIDE;
 
     // Sets information about this column
-    bool SetColumn(int col, const wxListItem& info);
+    bool SetColumn(int col, const wxListItem& info) wxOVERRIDE;
 
     // Gets the column width
-    int GetColumnWidth(int col) const;
+    int GetColumnWidth(int col) const wxOVERRIDE;
 
     // Sets the column width
-    bool SetColumnWidth(int col, int width);
+    bool SetColumnWidth(int col, int width) wxOVERRIDE;
 
 
     // Gets the column order from its index or index from its order
@@ -129,7 +129,7 @@ public:
     int GetItemCount() const;
 
     // Gets the number of columns in the list control
-    int GetColumnCount() const;
+    int GetColumnCount() const wxOVERRIDE;
 
     // get the horizontal and vertical components of the item spacing
     wxSize GetItemSpacing() const;
@@ -163,7 +163,7 @@ public:
     void SetSingleStyle(long style, bool add = true);
 
     // Set the whole window style
-    void SetWindowStyleFlag(long style);
+    void SetWindowStyleFlag(long style) wxOVERRIDE;
 
     // Searches for an item, starting from 'item'.
     // item can be -1 to find the first item that matches the
@@ -172,11 +172,11 @@ public:
     long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const;
 
     // Gets one of the three image lists
-    wxImageList *GetImageList(int which) const;
+    wxImageList *GetImageList(int which) const wxOVERRIDE;
 
     // Sets the image list
-    void SetImageList(wxImageList *imageList, int which);
-    void AssignImageList(wxImageList *imageList, int which);
+    void SetImageList(wxImageList *imageList, int which) wxOVERRIDE;
+    void AssignImageList(wxImageList *imageList, int which) wxOVERRIDE;
 
     // refresh items selectively (only useful for virtual list controls)
     void RefreshItem(long item);
@@ -195,10 +195,10 @@ public:
     bool DeleteAllItems();
 
     // Deletes a column
-    bool DeleteColumn(int col);
+    bool DeleteColumn(int col) wxOVERRIDE;
 
     // Deletes all columns
-    bool DeleteAllColumns();
+    bool DeleteAllColumns() wxOVERRIDE;
 
     // Clears items, and columns if there are any.
     void ClearAll();
@@ -265,28 +265,7 @@ public:
     // data is arbitrary data to be passed to the sort function.
     bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
 
-
-    // these functions are only used for virtual list view controls, i.e. the
-    // ones with wxLC_VIRTUAL style (not currently implemented in wxQT)
-
-    // 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);
-    }
-
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
     void Init();
diff --git a/include/wx/qt/mdi.h b/include/wx/qt/mdi.h
index a1970ba322..37448988a0 100644
--- a/include/wx/qt/mdi.h
+++ b/include/wx/qt/mdi.h
@@ -33,8 +33,8 @@ public:
 
     static bool IsTDI() { return false; }
 
-    virtual void ActivateNext();
-    virtual void ActivatePrevious();
+    virtual void ActivateNext() wxOVERRIDE;
+    virtual void ActivatePrevious() wxOVERRIDE;
 
 protected:
 
@@ -64,7 +64,7 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual void Activate();
+    virtual void Activate() wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
 };
@@ -76,7 +76,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
 public:
     wxMDIClientWindow();
 
-    virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
+    virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
     wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
 };
 
diff --git a/include/wx/qt/msgdlg.h b/include/wx/qt/msgdlg.h
index 08b3c6437d..513d50a0d5 100644
--- a/include/wx/qt/msgdlg.h
+++ b/include/wx/qt/msgdlg.h
@@ -22,7 +22,7 @@ public:
     virtual ~wxMessageDialog();
 
     // Reimplemented to translate return codes from Qt to wx
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog);
diff --git a/include/wx/qt/notebook.h b/include/wx/qt/notebook.h
index 6fbb072b7c..7b580b0245 100644
--- a/include/wx/qt/notebook.h
+++ b/include/wx/qt/notebook.h
@@ -28,29 +28,29 @@ public:
               long style = 0,
               const wxString& name = wxNotebookNameStr);
 
-    virtual void SetPadding(const wxSize& padding);
-    virtual void SetTabSize(const wxSize& sz);
+    virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
+    virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
 
-    virtual bool SetPageText(size_t n, const wxString& strText);
-    virtual wxString GetPageText(size_t n) const;
+    virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
+    virtual wxString GetPageText(size_t n) const wxOVERRIDE;
 
-    virtual int GetPageImage(size_t n) const;
-    virtual bool SetPageImage(size_t n, int imageId);
+    virtual int GetPageImage(size_t n) const wxOVERRIDE;
+    virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
 
     virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text,
-        bool bSelect = false, int imageId = -1);
+        bool bSelect = false, int imageId = -1) wxOVERRIDE;
 
-    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
 
-    int SetSelection(size_t nPage);
-    int ChangeSelection(size_t nPage);
+    int SetSelection(size_t nPage) wxOVERRIDE;
+    int ChangeSelection(size_t nPage) wxOVERRIDE;
 
     virtual bool DeleteAllPages() wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
-    virtual wxWindow *DoRemovePage(size_t page);
+    virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
 
 private:
     QTabWidget *m_qtTabWidget;
diff --git a/include/wx/qt/palette.h b/include/wx/qt/palette.h
index 331130f79c..23d221bc97 100644
--- a/include/wx/qt/palette.h
+++ b/include/wx/qt/palette.h
@@ -20,8 +20,8 @@ public:
     int GetPixel(unsigned char red, unsigned char green, unsigned char blue) 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;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxPalette);
diff --git a/include/wx/qt/pen.h b/include/wx/qt/pen.h
index c9d78b56ad..a095b0bd77 100644
--- a/include/wx/qt/pen.h
+++ b/include/wx/qt/pen.h
@@ -23,23 +23,23 @@ public:
     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const;
 
-    virtual void SetColour(const wxColour& col);
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
+    virtual void SetColour(const wxColour& col) wxOVERRIDE;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
 
-    virtual void SetWidth(int width);
-    virtual void SetStyle(wxPenStyle style);
-    virtual void SetStipple(const wxBitmap& stipple);
-    virtual void SetDashes(int nb_dashes, const wxDash *dash);
-    virtual void SetJoin(wxPenJoin join);
-    virtual void SetCap(wxPenCap cap);
+    virtual void SetWidth(int width) wxOVERRIDE;
+    virtual void SetStyle(wxPenStyle style) wxOVERRIDE;
+    virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
+    virtual void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE;
+    virtual void SetJoin(wxPenJoin join) wxOVERRIDE;
+    virtual void SetCap(wxPenCap cap) wxOVERRIDE;
 
-    virtual wxColour GetColour() const;
-    virtual wxBitmap *GetStipple() const;
-    virtual wxPenStyle GetStyle() const;
-    virtual wxPenJoin GetJoin() const;
-    virtual wxPenCap GetCap() const;
-    virtual int GetWidth() const;
-    virtual int GetDashes(wxDash **ptr) const;
+    virtual wxColour GetColour() const wxOVERRIDE;
+    virtual wxBitmap *GetStipple() const wxOVERRIDE;
+    virtual wxPenStyle GetStyle() const wxOVERRIDE;
+    virtual wxPenJoin GetJoin() const wxOVERRIDE;
+    virtual wxPenCap GetCap() const wxOVERRIDE;
+    virtual int GetWidth() const wxOVERRIDE;
+    virtual int GetDashes(wxDash **ptr) const wxOVERRIDE;
 
     wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
     void SetStyle(int style) { SetStyle((wxPenStyle)style); }
@@ -47,8 +47,8 @@ public:
     QPen GetHandle() 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;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxPen);
diff --git a/include/wx/qt/printdlg.h b/include/wx/qt/printdlg.h
index 1fd43ed1e9..93b62f5e78 100644
--- a/include/wx/qt/printdlg.h
+++ b/include/wx/qt/printdlg.h
@@ -16,10 +16,10 @@ class WXDLLIMPEXP_CORE wxQtPrintNativeData: public wxPrintNativeDataBase
 public:
     wxQtPrintNativeData();
 
-    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;
 
 };
 
@@ -29,9 +29,9 @@ public:
     wxQtPrintDialog(wxWindow *parent, wxPrintDialogData *data);
     wxQtPrintDialog(wxWindow *parent, wxPrintData *data);
 
-    virtual wxPrintDialogData& GetPrintDialogData();
-    virtual wxPrintData& GetPrintData();
-    virtual wxDC *GetPrintDC();
+    virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE;
+    virtual wxPrintData& GetPrintData() wxOVERRIDE;
+    virtual wxDC *GetPrintDC() wxOVERRIDE;
 
 protected:
 
@@ -48,7 +48,7 @@ public:
 
     bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
 
-    virtual wxPageSetupDialogData& GetPageSetupDialogData();
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE;
 
 private:
 };
diff --git a/include/wx/qt/printqt.h b/include/wx/qt/printqt.h
index 65c44bc194..2e0e765237 100644
--- a/include/wx/qt/printqt.h
+++ b/include/wx/qt/printqt.h
@@ -15,9 +15,9 @@ class WXDLLIMPEXP_CORE wxQtPrinter : public wxPrinterBase
 public:
     wxQtPrinter( wxPrintDialogData *data = NULL );
 
-    virtual bool Setup(wxWindow *parent);
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
-    virtual wxDC* PrintDialog(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent) wxOVERRIDE;
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE;
+    virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE;
 private:
 };
 
@@ -33,8 +33,8 @@ public:
                           wxPrintout *printoutForPrinting,
                           wxPrintData *data);
 
-    virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
+    virtual bool Print(bool interactive) wxOVERRIDE;
+    virtual void DetermineScaling() wxOVERRIDE;
 
 protected:
 };
diff --git a/include/wx/qt/private/timer.h b/include/wx/qt/private/timer.h
index d1d5790428..ab046291c0 100644
--- a/include/wx/qt/private/timer.h
+++ b/include/wx/qt/private/timer.h
@@ -23,12 +23,12 @@ class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject
 public:
     wxQtTimerImpl( wxTimer* timer );
 
-    virtual bool Start( int millisecs = -1, bool oneShot = false );
-    virtual void Stop();
-    virtual bool IsRunning() const;
+    virtual bool Start( int millisecs = -1, bool oneShot = false ) wxOVERRIDE;
+    virtual void Stop() wxOVERRIDE;
+    virtual bool IsRunning() const wxOVERRIDE;
 
 protected:
-    virtual void timerEvent( QTimerEvent * event );
+    virtual void timerEvent( QTimerEvent * event ) wxOVERRIDE;
 
 private:
     int m_timerId;
diff --git a/include/wx/qt/private/winevent.h b/include/wx/qt/private/winevent.h
index a8465b542a..5137f6d00e 100644
--- a/include/wx/qt/private/winevent.h
+++ b/include/wx/qt/private/winevent.h
@@ -67,7 +67,7 @@ public:
     {
     }
 
-    virtual Handler *GetHandler() const
+    virtual Handler *GetHandler() const wxOVERRIDE
     {
         // Only process the signal / event if the wxWindow is not destroyed
         if ( !wxWindow::QtRetrieveWindowPointer( this ) )
@@ -84,7 +84,7 @@ protected:
      * wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */
 
     //wxActivateEvent
-    virtual void changeEvent ( QEvent * event )
+    virtual void changeEvent ( QEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -96,7 +96,7 @@ protected:
     }
 
     //wxCloseEvent
-    virtual void closeEvent ( QCloseEvent * event )
+    virtual void closeEvent ( QCloseEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -108,7 +108,7 @@ protected:
     }
 
     //wxContextMenuEvent
-    virtual void contextMenuEvent ( QContextMenuEvent * event )
+    virtual void contextMenuEvent ( QContextMenuEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -123,7 +123,7 @@ protected:
     //virtual void dropEvent ( QDropEvent * event ) { }
 
     //wxMouseEvent
-    virtual void enterEvent ( QEvent * event )
+    virtual void enterEvent ( QEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -135,7 +135,7 @@ protected:
     }
 
     //wxFocusEvent.
-    virtual void focusInEvent ( QFocusEvent * event )
+    virtual void focusInEvent ( QFocusEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -147,7 +147,7 @@ protected:
     }
 
     //wxFocusEvent.
-    virtual void focusOutEvent ( QFocusEvent * event )
+    virtual void focusOutEvent ( QFocusEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -159,7 +159,7 @@ protected:
     }
 
     //wxShowEvent
-    virtual void hideEvent ( QHideEvent * event )
+    virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -171,7 +171,7 @@ protected:
     }
 
     //wxKeyEvent
-    virtual void keyPressEvent ( QKeyEvent * event )
+    virtual void keyPressEvent ( QKeyEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -183,7 +183,7 @@ protected:
     }
 
     //wxKeyEvent
-    virtual void keyReleaseEvent ( QKeyEvent * event )
+    virtual void keyReleaseEvent ( QKeyEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -195,7 +195,7 @@ protected:
     }
 
     //wxMouseEvent
-    virtual void leaveEvent ( QEvent * event )
+    virtual void leaveEvent ( QEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -207,7 +207,7 @@ protected:
     }
 
     //wxMouseEvent
-    virtual void mouseDoubleClickEvent ( QMouseEvent * event )
+    virtual void mouseDoubleClickEvent ( QMouseEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -219,7 +219,7 @@ protected:
     }
 
     //wxMouseEvent
-    virtual void mouseMoveEvent ( QMouseEvent * event )
+    virtual void mouseMoveEvent ( QMouseEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -231,7 +231,7 @@ protected:
     }
 
     //wxMouseEvent
-    virtual void mousePressEvent ( QMouseEvent * event )
+    virtual void mousePressEvent ( QMouseEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -243,7 +243,7 @@ protected:
     }
 
     //wxMouseEvent
-    virtual void mouseReleaseEvent ( QMouseEvent * event )
+    virtual void mouseReleaseEvent ( QMouseEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -255,7 +255,7 @@ protected:
     }
 
     //wxMoveEvent
-    virtual void moveEvent ( QMoveEvent * event )
+    virtual void moveEvent ( QMoveEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -267,7 +267,7 @@ protected:
     }
 
     //wxEraseEvent then wxPaintEvent
-    virtual void paintEvent ( QPaintEvent * event )
+    virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -279,7 +279,7 @@ protected:
     }
 
     //wxSizeEvent
-    virtual void resizeEvent ( QResizeEvent * event )
+    virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -291,7 +291,7 @@ protected:
     }
 
     //wxShowEvent
-    virtual void showEvent ( QShowEvent * event )
+    virtual void showEvent ( QShowEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
@@ -303,7 +303,7 @@ protected:
     }
 
     //wxMouseEvent
-    virtual void wheelEvent ( QWheelEvent * event )
+    virtual void wheelEvent ( QWheelEvent * event ) wxOVERRIDE
     {
         if ( !this->GetHandler() )
             return;
diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h
index a3149e25e6..43ca8284ba 100644
--- a/include/wx/qt/radiobox.h
+++ b/include/wx/qt/radiobox.h
@@ -72,14 +72,14 @@ public:
     virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE;
     virtual bool IsItemShown(unsigned int n) const wxOVERRIDE;
 
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
+    virtual unsigned int GetCount() const wxOVERRIDE;
+    virtual wxString GetString(unsigned int n) const wxOVERRIDE;
+    virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
 
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
+    virtual void SetSelection(int n) wxOVERRIDE;
+    virtual int GetSelection() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     // The 'visual' group box:
diff --git a/include/wx/qt/radiobut.h b/include/wx/qt/radiobut.h
index 56864e9094..104d262e2d 100644
--- a/include/wx/qt/radiobut.h
+++ b/include/wx/qt/radiobut.h
@@ -35,7 +35,7 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     QRadioButton *m_qtRadioButton;
diff --git a/include/wx/qt/region.h b/include/wx/qt/region.h
index a1cb66c111..a308cb0f25 100644
--- a/include/wx/qt/region.h
+++ b/include/wx/qt/region.h
@@ -24,29 +24,29 @@ public:
     wxRegion(const wxBitmap& bmp);
     wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
 
-    virtual bool IsEmpty() const;
-    virtual void Clear();
+    virtual bool IsEmpty() const wxOVERRIDE;
+    virtual void Clear() wxOVERRIDE;
 
     virtual const QRegion &GetHandle() const;
     virtual void QtSetRegion(QRegion region); // Hangs on to this region
 
 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;
 
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
+    virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
+    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
+    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
+    virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
 
-    virtual bool DoOffset(wxCoord x, wxCoord y);
+    virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
 
-    virtual bool DoUnionWithRect(const wxRect& rect);
-    virtual bool DoUnionWithRegion(const wxRegion& region);
+    virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
+    virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE;
 
-    virtual bool DoIntersect(const wxRegion& region);
-    virtual bool DoSubtract(const wxRegion& region);
-    virtual bool DoXor(const wxRegion& region);
+    virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE;
+    virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE;
+    virtual bool DoXor(const wxRegion& region) wxOVERRIDE;
 
     virtual bool DoCombine(const wxRegion& rgn, wxRegionOp op);
 
diff --git a/include/wx/qt/scrolbar.h b/include/wx/qt/scrolbar.h
index e1ea3ebe4b..87d7b7f90c 100644
--- a/include/wx/qt/scrolbar.h
+++ b/include/wx/qt/scrolbar.h
@@ -32,18 +32,18 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );
 
-    virtual int GetThumbPosition() const;
-    virtual int GetThumbSize() const;
-    virtual int GetPageSize() const;
-    virtual int GetRange() const;
+    virtual int GetThumbPosition() const wxOVERRIDE;
+    virtual int GetThumbSize() const wxOVERRIDE;
+    virtual int GetPageSize() const wxOVERRIDE;
+    virtual int GetRange() const wxOVERRIDE;
 
-    virtual void SetThumbPosition(int viewStart);
+    virtual void SetThumbPosition(int viewStart) wxOVERRIDE;
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,
-                              bool refresh = true);
+                              bool refresh = true) wxOVERRIDE;
 
     QScrollBar *GetQScrollBar() const { return m_qtScrollBar; }
-    QWidget *GetHandle() const;
+    QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     QScrollBar *m_qtScrollBar;
diff --git a/include/wx/qt/slider.h b/include/wx/qt/slider.h
index 0a183f84b1..823df0a0bc 100644
--- a/include/wx/qt/slider.h
+++ b/include/wx/qt/slider.h
@@ -32,25 +32,25 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxSliderNameStr);
 
-    virtual int GetValue() const;
-    virtual void SetValue(int value);
+    virtual int GetValue() const wxOVERRIDE;
+    virtual void SetValue(int value) wxOVERRIDE;
 
-    virtual void SetRange(int minValue, int maxValue);
-    virtual int GetMin() const;
-    virtual int GetMax() const;
+    virtual void SetRange(int minValue, int maxValue) wxOVERRIDE;
+    virtual int GetMin() const wxOVERRIDE;
+    virtual int GetMax() const wxOVERRIDE;
 
-    virtual void DoSetTickFreq(int freq);
-    virtual int GetTickFreq() const;
+    virtual void DoSetTickFreq(int freq) wxOVERRIDE;
+    virtual int GetTickFreq() const wxOVERRIDE;
 
-    virtual void SetLineSize(int lineSize);
-    virtual void SetPageSize(int pageSize);
-    virtual int GetLineSize() const;
-    virtual int GetPageSize() const;
+    virtual void SetLineSize(int lineSize) wxOVERRIDE;
+    virtual void SetPageSize(int pageSize) wxOVERRIDE;
+    virtual int GetLineSize() const wxOVERRIDE;
+    virtual int GetPageSize() const wxOVERRIDE;
 
-    virtual void SetThumbLength(int lenPixels);
-    virtual int GetThumbLength() const;
+    virtual void SetThumbLength(int lenPixels) wxOVERRIDE;
+    virtual int GetThumbLength() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     QSlider *m_qtSlider;
diff --git a/include/wx/qt/spinbutt.h b/include/wx/qt/spinbutt.h
index 10771bc0bf..fe69e878a9 100644
--- a/include/wx/qt/spinbutt.h
+++ b/include/wx/qt/spinbutt.h
@@ -29,11 +29,11 @@ public:
                 long style = wxSP_VERTICAL,
                 const wxString& name = wxSPIN_BUTTON_NAME);
 
-    virtual int GetValue() const;
-    virtual void SetValue(int val);
+    virtual int GetValue() const wxOVERRIDE;
+    virtual void SetValue(int val) wxOVERRIDE;
     virtual void SetRange(int min, int max) wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     QSpinBox *m_qtSpinBox;
diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h
index 714dc5982b..9355ff9fc6 100644
--- a/include/wx/qt/spinctrl.h
+++ b/include/wx/qt/spinctrl.h
@@ -29,12 +29,12 @@ public:
         T min, T max, T initial, T inc,
         const wxString& name );
 
-    virtual void SetValue(const wxString&) {}
+    virtual void SetValue(const wxString&) wxOVERRIDE {}
 
-    virtual void SetSnapToTicks(bool snap_to_ticks);
-    virtual bool GetSnapToTicks() const;
+    virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE;
+    virtual bool GetSnapToTicks() const wxOVERRIDE;
 
-    virtual void SetSelection(long from, long to);
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
 
     virtual void SetValue(T val);
     void SetRange(T minVal, T maxVal);
@@ -45,7 +45,7 @@ public:
     T GetMax() const;
     T GetIncrement() const;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
     Widget *m_qtSpinBox;
@@ -75,8 +75,8 @@ public:
                 const wxString& name = wxT("wxSpinCtrl"));
     virtual int GetBase() const wxOVERRIDE { return m_base; }
     virtual bool SetBase(int base) wxOVERRIDE;
-    virtual void SetValue(const wxString & val);
-    virtual void SetValue(int val) { wxSpinCtrlQt<int,QSpinBox>::SetValue(val); }
+    virtual void SetValue(const wxString & val) wxOVERRIDE;
+    virtual void SetValue(int val) wxOVERRIDE { wxSpinCtrlQt<int,QSpinBox>::SetValue(val); }
 
 private:
     // Common part of all ctors.
@@ -117,8 +117,8 @@ public:
 
     virtual int GetBase() const wxOVERRIDE { return 10; }
     virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
-    virtual void SetValue(const wxString & val);
-    virtual void SetValue(double val) { wxSpinCtrlQt<double,QDoubleSpinBox>::SetValue(val); }
+    virtual void SetValue(const wxString & val) wxOVERRIDE;
+    virtual void SetValue(double val) wxOVERRIDE { wxSpinCtrlQt<double,QDoubleSpinBox>::SetValue(val); }
 
 private:
     wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );
diff --git a/include/wx/qt/statbmp.h b/include/wx/qt/statbmp.h
index a61fb5e8fc..cf57a3aef4 100644
--- a/include/wx/qt/statbmp.h
+++ b/include/wx/qt/statbmp.h
@@ -30,12 +30,12 @@ public:
                  long style = 0,
                  const wxString& name = wxStaticBitmapNameStr);
 
-    virtual void SetIcon(const wxIcon& icon);
-    virtual void SetBitmap(const wxBitmap& bitmap);
-    virtual wxBitmap GetBitmap() const;
-    virtual wxIcon GetIcon() const;
+    virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
+    virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
+    virtual wxBitmap GetBitmap() const wxOVERRIDE;
+    virtual wxIcon GetIcon() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 protected:
 
 private:
diff --git a/include/wx/qt/statbox.h b/include/wx/qt/statbox.h
index 8589adf4b1..ab3dfdee01 100644
--- a/include/wx/qt/statbox.h
+++ b/include/wx/qt/statbox.h
@@ -29,9 +29,9 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
-    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
     virtual wxString GetLabel() const wxOVERRIDE;
diff --git a/include/wx/qt/statline.h b/include/wx/qt/statline.h
index aca385e5ec..728815a1f9 100644
--- a/include/wx/qt/statline.h
+++ b/include/wx/qt/statline.h
@@ -29,7 +29,7 @@ public:
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticLineNameStr );
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     QFrame *m_qtFrame;
diff --git a/include/wx/qt/stattext.h b/include/wx/qt/stattext.h
index 513bae3479..f427f16490 100644
--- a/include/wx/qt/stattext.h
+++ b/include/wx/qt/stattext.h
@@ -33,7 +33,7 @@ public:
     virtual void SetLabel(const wxString& label) wxOVERRIDE;
     virtual wxString GetLabel() const wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 private:
     QLabel *m_qtLabel;
diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h
index df9ae9891d..eeb094746c 100644
--- a/include/wx/qt/statusbar.h
+++ b/include/wx/qt/statusbar.h
@@ -27,18 +27,18 @@ public:
                 long style = wxSTB_DEFAULT_STYLE,
                 const wxString& name = wxStatusBarNameStr);
 
-    virtual bool GetFieldRect(int i, wxRect& rect) const;
-    virtual void SetMinHeight(int height);
-    virtual int GetBorderX() const;
-    virtual int GetBorderY() const;
+    virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
+    virtual void SetMinHeight(int height) wxOVERRIDE;
+    virtual int GetBorderX() const wxOVERRIDE;
+    virtual int GetBorderY() const wxOVERRIDE;
     virtual void Refresh( bool eraseBackground = true,
-                          const wxRect *rect = (const wxRect *) NULL );
+                          const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE;
 
     QStatusBar *GetQStatusBar() const { return m_qtStatusBar; }
-    QWidget *GetHandle() const;
+    QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
-    virtual void DoUpdateStatusText(int number);
+    virtual void DoUpdateStatusText(int number) wxOVERRIDE;
 
 private:
     void Init();
diff --git a/include/wx/qt/taskbar.h b/include/wx/qt/taskbar.h
index 6ac90e6f71..7d19073f55 100644
--- a/include/wx/qt/taskbar.h
+++ b/include/wx/qt/taskbar.h
@@ -22,9 +22,9 @@ public:
 
     // Operations
     virtual bool SetIcon(const wxIcon& icon,
-                         const wxString& tooltip = wxEmptyString);
-    virtual bool RemoveIcon();
-    virtual bool PopupMenu(wxMenu *menu);
+                         const wxString& tooltip = wxEmptyString) wxOVERRIDE;
+    virtual bool RemoveIcon() wxOVERRIDE;
+    virtual bool PopupMenu(wxMenu *menu) wxOVERRIDE;
 
 private:
     QSystemTrayIcon *m_qtSystemTrayIcon;
diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h
index 3cd57c936c..b28fe0e5fe 100644
--- a/include/wx/qt/textctrl.h
+++ b/include/wx/qt/textctrl.h
@@ -35,41 +35,41 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString &name = wxTextCtrlNameStr);
 
-    virtual int GetLineLength(long lineNo) const;
-    virtual wxString GetLineText(long lineNo) const;
-    virtual int GetNumberOfLines() const;
+    virtual int GetLineLength(long lineNo) const wxOVERRIDE;
+    virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
+    virtual int GetNumberOfLines() const wxOVERRIDE;
 
-    virtual bool IsModified() const;
-    virtual void MarkDirty();
-    virtual void DiscardEdits();
+    virtual bool IsModified() const wxOVERRIDE;
+    virtual void MarkDirty() wxOVERRIDE;
+    virtual void DiscardEdits() wxOVERRIDE;
 
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
-    virtual bool GetStyle(long position, wxTextAttr& style);
-    virtual bool SetDefaultStyle(const wxTextAttr& style);
+    virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
+    virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
+    virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
 
-    virtual long XYToPosition(long x, long y) const;
-    virtual bool PositionToXY(long pos, long *x, long *y) const;
+    virtual long XYToPosition(long x, long y) const wxOVERRIDE;
+    virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
 
-    virtual void ShowPosition(long pos);
+    virtual void ShowPosition(long pos) wxOVERRIDE;
 
-    virtual void SetInsertionPoint(long pos);
-    virtual long GetInsertionPoint() const;
-    virtual void SetSelection( long from, long to );
-    virtual void GetSelection(long *from, long *to) const;
+    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
+    virtual long GetInsertionPoint() const wxOVERRIDE;
+    virtual void SetSelection( long from, long to ) wxOVERRIDE;
+    virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
 
-    virtual wxString DoGetValue() const;
-    virtual void DoSetValue(const wxString &text, int flags = 0);
-    virtual void WriteText(const wxString& text);
+    virtual wxString DoGetValue() const wxOVERRIDE;
+    virtual void DoSetValue(const wxString &text, int flags = 0) wxOVERRIDE;
+    virtual void WriteText(const wxString& text) wxOVERRIDE;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-    virtual bool DoSaveFile(const wxString& file, int fileType);
+    virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
+    virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE;
 
-    virtual QScrollArea *QtGetScrollBarsContainer() const;
+    virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
 
 private:
     wxQtEdit *m_qtEdit;
diff --git a/include/wx/qt/textentry.h b/include/wx/qt/textentry.h
index 685edda867..d9287a2819 100644
--- a/include/wx/qt/textentry.h
+++ b/include/wx/qt/textentry.h
@@ -13,34 +13,34 @@ class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
 public:
     wxTextEntry();
 
-    virtual void WriteText(const wxString& text);
+    virtual void WriteText(const wxString& text) wxOVERRIDE;
 
-    virtual void Remove(long from, long to);
+    virtual void Remove(long from, long to) wxOVERRIDE;
 
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
+    virtual void Copy() wxOVERRIDE;
+    virtual void Cut() wxOVERRIDE;
+    virtual void Paste() wxOVERRIDE;
 
-    virtual void Undo();
-    virtual void Redo();
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
+    virtual void Undo() wxOVERRIDE;
+    virtual void Redo() wxOVERRIDE;
+    virtual bool CanUndo() const wxOVERRIDE;
+    virtual bool CanRedo() const wxOVERRIDE;
 
-    virtual void SetInsertionPoint(long pos);
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
+    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
+    virtual long GetInsertionPoint() const wxOVERRIDE;
+    virtual long GetLastPosition() const wxOVERRIDE;
 
-    virtual void SetSelection(long from, long to);
-    virtual void GetSelection(long *from, long *to) const;
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
+    virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
 
-    virtual bool IsEditable() const;
-    virtual void SetEditable(bool editable);
+    virtual bool IsEditable() const wxOVERRIDE;
+    virtual void SetEditable(bool editable) wxOVERRIDE;
 
 protected:
-    virtual wxString DoGetValue() const;
-    virtual void DoSetValue(const wxString& value, int flags=0);
+    virtual wxString DoGetValue() const wxOVERRIDE;
+    virtual void DoSetValue(const wxString& value, int flags=0) wxOVERRIDE;
 
-    virtual wxWindow *GetEditableWindow();
+    virtual wxWindow *GetEditableWindow() wxOVERRIDE;
 };
 
 #endif // _WX_QT_TEXTENTRY_H_
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index f2b361e579..2bb47042ae 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -32,8 +32,8 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxCheckBoxNameStr);
 
-    virtual void SetValue(bool state);
-    virtual bool GetValue() const;
+    virtual void SetValue(bool state) wxOVERRIDE;
+    virtual bool GetValue() const wxOVERRIDE;
 
     // implementation only
     virtual int GetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; }
diff --git a/include/wx/qt/toplevel.h b/include/wx/qt/toplevel.h
index 8eb283cc70..8e5f7f6208 100644
--- a/include/wx/qt/toplevel.h
+++ b/include/wx/qt/toplevel.h
@@ -30,21 +30,21 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual bool Show(bool show = true) wxOVERRIDE;
-    virtual void Maximize(bool maximize = true);
-    virtual void Restore();
-    virtual void Iconize(bool iconize = true);
-    virtual bool IsMaximized() const;
-    virtual bool IsIconized() const;
+    virtual void Maximize(bool maximize = true) wxOVERRIDE;
+    virtual void Restore() wxOVERRIDE;
+    virtual void Iconize(bool iconize = true) wxOVERRIDE;
+    virtual bool IsMaximized() const wxOVERRIDE;
+    virtual bool IsIconized() const wxOVERRIDE;
 
-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const;
-    virtual void SetTitle(const wxString& title);
-    virtual wxString GetTitle() const;
-    virtual void SetIcons(const wxIconBundle& icons);
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
+    virtual bool IsFullScreen() const wxOVERRIDE;
+    virtual void SetTitle(const wxString& title) wxOVERRIDE;
+    virtual wxString GetTitle() const wxOVERRIDE;
+    virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
 
     // Styles
-    virtual void SetWindowStyleFlag( long style );
-    virtual long GetWindowStyleFlag() const;
+    virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
+    virtual long GetWindowStyleFlag() const wxOVERRIDE;
 };
 
 #endif // _WX_QT_TOPLEVEL_H_
diff --git a/include/wx/qt/treectrl.h b/include/wx/qt/treectrl.h
index 5fdc125ce0..9eb385b71d 100644
--- a/include/wx/qt/treectrl.h
+++ b/include/wx/qt/treectrl.h
@@ -112,7 +112,7 @@ public:
 
     virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const;
 
-    virtual QWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const wxOVERRIDE;
 
 protected:
     virtual int DoGetItemState(const wxTreeItemId& item) const;
diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h
index ad3b3c6532..1001054d2c 100644
--- a/include/wx/ribbon/art.h
+++ b/include/wx/ribbon/art.h
@@ -73,6 +73,8 @@ enum wxRibbonArtSetting
     wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR,
     wxRIBBON_ART_GALLERY_ITEM_BORDER_COLOUR,
     wxRIBBON_ART_TAB_LABEL_COLOUR,
+    wxRIBBON_ART_TAB_ACTIVE_LABEL_COLOUR,
+    wxRIBBON_ART_TAB_HOVER_LABEL_COLOUR,
     wxRIBBON_ART_TAB_SEPARATOR_COLOUR,
     wxRIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR,
     wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR,
@@ -668,6 +670,8 @@ protected:
     wxColour m_button_bar_label_colour;
     wxColour m_button_bar_label_disabled_colour;
     wxColour m_tab_label_colour;
+    wxColour m_tab_active_label_colour;
+    wxColour m_tab_hover_label_colour;
     wxColour m_tab_separator_colour;
     wxColour m_tab_separator_gradient_colour;
     wxColour m_tab_active_background_colour;
diff --git a/include/wx/richtext/richtextsymboldlg.h b/include/wx/richtext/richtextsymboldlg.h
index 40f5621ae4..8c966545df 100644
--- a/include/wx/richtext/richtextsymboldlg.h
+++ b/include/wx/richtext/richtextsymboldlg.h
@@ -137,16 +137,16 @@ public:
 ////@begin wxSymbolPickerDialog member function declarations
 
     wxString GetFontName() const { return m_fontName ; }
-    void SetFontName(wxString value) { m_fontName = value ; }
+    void SetFontName(const wxString& value) { m_fontName = value; }
 
     bool GetFromUnicode() const { return m_fromUnicode ; }
     void SetFromUnicode(bool value) { m_fromUnicode = value ; }
 
     wxString GetNormalTextFontName() const { return m_normalTextFontName ; }
-    void SetNormalTextFontName(wxString value) { m_normalTextFontName = value ; }
+    void SetNormalTextFontName(const wxString& value) { m_normalTextFontName = value; }
 
     wxString GetSymbol() const { return m_symbol ; }
-    void SetSymbol(wxString value) { m_symbol = value ; }
+    void SetSymbol(const wxString& value) { m_symbol = value; }
 
     /// Retrieves bitmap resources
     wxBitmap GetBitmapResource( const wxString& name );
diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 029b0cb4b9..c7a858feea 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -11,6 +11,7 @@
 #ifndef _WX_SCROLWIN_H_BASE_
 #define _WX_SCROLWIN_H_BASE_
 
+#include "wx/control.h"
 #include "wx/panel.h"
 
 class WXDLLIMPEXP_FWD_CORE wxScrollHelperEvtHandler;
@@ -378,6 +379,28 @@ struct WXDLLIMPEXP_CORE wxScrolledT_Helper
 // Scrollable window base on window type T. This used to be wxScrolledWindow,
 // but wxScrolledWindow includes wxControlContainer functionality and that's
 // not always desirable.
+template<class T>
+bool wxCreateScrolled(T* self,
+                      wxWindow *parent, wxWindowID winid,
+                      const wxPoint& pos, const wxSize& size,
+                      long style, const wxString& name)
+{
+    return self->Create(parent, winid, pos, size, style, name);
+}
+
+#if wxUSE_CONTROLS
+// For wxControl we have to provide overloaded wxCreateScrolled()
+// because wxControl::Create() has 7 parameters and therefore base
+// template expecting 6-parameter T::Create() cannot be used.
+inline bool wxCreateScrolled(wxControl* self,
+                     wxWindow *parent, wxWindowID winid,
+                     const wxPoint& pos, const wxSize& size,
+                     long style, const wxString& name)
+{
+     return self->Create(parent, winid, pos, size, style, wxDefaultValidator, name);
+}
+#endif // wxUSE_CONTROLS
+
 template<class T>
 class wxScrolled : public T,
                    public wxScrollHelper,
@@ -415,7 +438,7 @@ public:
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 
-        return T::Create(parent, winid, pos, size, style, name);
+        return wxCreateScrolled((T*)this, parent, winid, pos, size, style, name);
     }
 
 #ifdef __WXMSW__
diff --git a/include/wx/settings.h b/include/wx/settings.h
index cf5602ccd8..f66acfe179 100644
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -162,6 +162,39 @@ enum wxSystemScreenType
     wxSYS_SCREEN_DESKTOP    //   >= 800x600
 };
 
+// ----------------------------------------------------------------------------
+// wxSystemAppearance: describes the global appearance used for the UI
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxSystemAppearance
+{
+public:
+    // Return the name if available or empty string otherwise.
+    wxString GetName() const;
+
+    // Return true if the current system there is explicitly recognized as
+    // being a dark theme or if the default window background is dark.
+    bool IsDark() const;
+
+    // Return true if the background is darker than foreground. This is used by
+    // IsDark() if there is no platform-specific way to determine whether a
+    // dark mode is being used.
+    bool IsUsingDarkBackground() const;
+
+private:
+    friend class wxSystemSettingsNative;
+
+    // Ctor is private, even though it's trivial, because objects of this type
+    // are only supposed to be created by wxSystemSettingsNative.
+    wxSystemAppearance() { }
+
+    // Currently this class doesn't have any internal state because the only
+    // available implementation doesn't need it. If we do need it later, we
+    // could add some "wxSystemAppearanceImpl* const m_impl" here, which we'd
+    // forward our public functions to (we'd also need to add the copy ctor and
+    // dtor to clone/free it).
+};
+
 // ----------------------------------------------------------------------------
 // wxSystemSettingsNative: defines the API for wxSystemSettings class
 // ----------------------------------------------------------------------------
@@ -185,6 +218,9 @@ public:
     // get a system-dependent metric
     static int GetMetric(wxSystemMetric index, wxWindow * win = NULL);
 
+    // get the object describing the current system appearance
+    static wxSystemAppearance GetAppearance();
+
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);
 };
diff --git a/include/wx/sstream.h b/include/wx/sstream.h
index 47d17565a4..865acd3dea 100644
--- a/include/wx/sstream.h
+++ b/include/wx/sstream.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-09-19
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/stackwalk.h b/include/wx/stackwalk.h
index c0ba151d75..4bf4385f95 100644
--- a/include/wx/stackwalk.h
+++ b/include/wx/stackwalk.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-07
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 9348a023a8..94ce11aa2c 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -3090,7 +3090,7 @@ public:
     int MarkerPrevious(int lineStart, int markerMask);
 
     // Define a marker from a bitmap
-    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+    void MarkerDefinePixmap(int markerNumber, const char* const* xpmData);
 
     // Add a set of markers to a line.
     void MarkerAddSet(int line, int markerSet);
@@ -3441,7 +3441,7 @@ public:
     bool AutoCompGetDropRestOfWord() const;
 
     // Register an image for use in autocompletion lists.
-    void RegisterImage(int type, const wxBitmap& bmp);
+    void RegisterImage(int type, const char* const* xpmData);
 
     // Clear all the registered images.
     void ClearRegisteredImages();
@@ -3883,19 +3883,19 @@ public:
     // Set the display mode of visual flags for wrapped lines.
     void SetWrapVisualFlags(int wrapVisualFlags);
 
-    // Retrive the display mode of visual flags for wrapped lines.
+    // Retrieve the display mode of visual flags for wrapped lines.
     int GetWrapVisualFlags() const;
 
     // Set the location of visual flags for wrapped lines.
     void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation);
 
-    // Retrive the location of visual flags for wrapped lines.
+    // Retrieve the location of visual flags for wrapped lines.
     int GetWrapVisualFlagsLocation() const;
 
     // Set the start indent for wrapped lines.
     void SetWrapStartIndent(int indent);
 
-    // Retrive the start indent for wrapped lines.
+    // Retrieve the start indent for wrapped lines.
     int GetWrapStartIndent() const;
 
     // Sets how wrapped sublines are placed. Default is wxSTC_WRAPINDENT_FIXED.
@@ -5181,6 +5181,22 @@ public:
     // Clear annotations from the given line.
     void AnnotationClearLine(int line);
 
+    // Define a marker from a bitmap.
+    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+
+    // Register an image for use in autocompletion lists.
+    void RegisterImage(int type, const wxBitmap& bmp);
+
+    // Set the colours used to display the items in an autocompletion list.
+    void AutoCompSetColours(const wxColour& background, const wxColour& text,
+                            const wxColour& highlight,
+                            const wxColour& highlightText);
+
+    // Use a wxListCtrl to display autocompletion lists.
+    void AutoCompUseListCtrl(bool useListCtrl = true,
+                             const wxColour& currentBgColour = wxNullColour,
+                             const wxColour& currentTextColour = wxNullColour);
+
 
 
     // The following methods are nearly equivalent to their similarly named
diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index e7ce24bec4..effa94c313 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-17
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 207a235605..d344a5a911 100644
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -32,6 +32,8 @@ class WXDLLIMPEXP_FWD_BASE wxString;
 // don't let the fact that the existing classes implement MB2WC/WC2MB() instead
 // confuse you.
 //
+// For many encodings you must override GetMaxCharLen().
+//
 // You also have to implement Clone() to allow copying the conversions
 // polymorphically.
 //
@@ -118,6 +120,10 @@ public:
     wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
 #endif // Unicode/ANSI
 
+    // return the maximum number of bytes that can be required to encode a
+    // single character in this encoding, e.g. 4 for UTF-8
+    virtual size_t GetMaxCharLen() const { return 1; }
+
     // this function is used in the implementation of cMB2WC() to distinguish
     // between the following cases:
     //
@@ -254,6 +260,8 @@ public:
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
 
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
+
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF7; }
 
 private:
@@ -341,6 +349,8 @@ public:
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
 
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
+
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvStrictUTF8(); }
 
     // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't
@@ -365,6 +375,8 @@ public:
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
 
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
+
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF8(m_options); }
 
     // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't
@@ -405,6 +417,7 @@ public:
                            const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16LE; }
 };
 
@@ -419,6 +432,7 @@ public:
                            const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF16BE; }
 };
 
@@ -451,6 +465,7 @@ public:
                            const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32LE; }
 };
 
@@ -465,6 +480,7 @@ public:
                            const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
     virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConvUTF32BE; }
 };
 
@@ -566,6 +582,10 @@ public:
     FromWChar(char *dst, size_t dstLen,
               const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
 
+    // Use the value for UTF-8 here to make sure we try to decode up to 4 bytes
+    // as UTF-8 before giving up.
+    virtual size_t GetMaxCharLen() const wxOVERRIDE { return 4; }
+
     virtual wxMBConv *Clone() const wxOVERRIDE
     {
         return new wxWhateverWorksConv();
diff --git a/include/wx/string.h b/include/wx/string.h
index 7b63c81e2a..e6f6931300 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -3980,32 +3980,6 @@ namespace std
 
 #endif // C++11
 
-// Specialize std::iter_swap in C++11 to make std::reverse() work with wxString
-// iterators: unlike in C++98, where iter_swap() is required to deal with the
-// iterator::reference being different from "iterator::value_type&", in C++11
-// iter_swap() just calls swap() by default and this doesn't work for us as
-// wxUniCharRef is not the same as "wxUniChar&".
-//
-// Unfortunately currently iter_swap() can't be specialized when using libc++,
-// see https://llvm.org/bugs/show_bug.cgi?id=28559
-#if (__cplusplus >= 201103L) && !defined(_LIBCPP_VERSION)
-
-namespace std
-{
-    template <>
-    inline void
-    iter_swap<wxString::iterator>(wxString::iterator i1, wxString::iterator i2)
-    {
-        // We don't check for i1 == i2, this won't happen in normal use, so
-        // don't pessimize the common code to account for it.
-        wxUniChar tmp = *i1;
-        *i1 = *i2;
-        *i2 = tmp;
-    }
-} // namespace std
-
-#endif // C++11
-
 // ---------------------------------------------------------------------------
 // Implementation only from here until the end of file
 // ---------------------------------------------------------------------------
diff --git a/include/wx/systhemectrl.h b/include/wx/systhemectrl.h
index 269c361855..5881b6cbd1 100644
--- a/include/wx/systhemectrl.h
+++ b/include/wx/systhemectrl.h
@@ -21,7 +21,21 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_CORE wxSystemThemedControlBase
 {
 public:
-    wxSystemThemedControlBase() { }
+    wxSystemThemedControlBase()
+    {
+#ifdef wxHAS_SYSTEM_THEMED_CONTROL
+        m_systemThemeDisabled = false;
+#endif // wxHAS_SYSTEM_THEMED_CONTROL
+    }
+
+    bool IsSystemThemeDisabled() const
+    {
+#ifdef wxHAS_SYSTEM_THEMED_CONTROL
+        return m_systemThemeDisabled;
+#else // !wxHAS_SYSTEM_THEMED_CONTROL
+        return false;
+#endif // wxHAS_SYSTEM_THEMED_CONTROL/!wxHAS_SYSTEM_THEMED_CONTROL
+    }
 
     virtual ~wxSystemThemedControlBase() { }
 
@@ -36,6 +50,11 @@ protected:
     (bool WXUNUSED(enable), wxWindow* WXUNUSED(window)) { }
 #endif // wxHAS_SYSTEM_THEMED_CONTROL
 
+private:
+#ifdef wxHAS_SYSTEM_THEMED_CONTROL
+    bool m_systemThemeDisabled;
+#endif // wxHAS_SYSTEM_THEMED_CONTROL
+
     wxDECLARE_NO_COPY_CLASS(wxSystemThemedControlBase);
 };
 
@@ -54,6 +73,14 @@ public:
     }
 
 protected:
+    void EnableSystemThemeByDefault()
+    {
+        // Check if the system theme hadn't been explicitly disabled before
+        // enabling it by default.
+        if ( !this->IsSystemThemeDisabled() )
+            DoEnableSystemTheme(true, this);
+    }
+
     wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSystemThemedControl, C);
 };
 
diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index e44f3f0124..0f8a6bcbd9 100644
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -3,7 +3,7 @@
 // Purpose:     declares wxTextEntry interface defining a simple text entry
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/typeinfo.h b/include/wx/typeinfo.h
index 14fb057fc9..c20106df30 100644
--- a/include/wx/typeinfo.h
+++ b/include/wx/typeinfo.h
@@ -106,7 +106,7 @@ typedef void (*wxTypeIdentifier)();
 // WX_DECLARE_TYPEINFO() or WX_DECLARE_TYPEINFO_INLINE() however.
 #define _WX_DECLARE_TYPEINFO_CUSTOM(CLS, IDENTFUNC) \
 public: \
-    virtual wxTypeIdentifier GetWxTypeId() const \
+    virtual wxTypeIdentifier GetWxTypeId() const wxOVERRIDE \
     { \
         return reinterpret_cast<wxTypeIdentifier> \
             (&IDENTFUNC); \
diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 01c188907e..a0cc71937b 100644
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -360,6 +360,23 @@ void swap<wxUniCharRef>(wxUniCharRef& lhs, wxUniCharRef& rhs)
 
 } // namespace std
 
+#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
+
+// For std::iter_swap() to work with wxString::iterator, which uses
+// wxUniCharRef as its reference type, we need to ensure that swap() works with
+// wxUniCharRef objects by defining this overload.
+//
+// See https://bugs.llvm.org/show_bug.cgi?id=28559#c9
+inline
+void swap(wxUniCharRef&& lhs, wxUniCharRef&& rhs)
+{
+    wxUniChar tmp = lhs;
+    lhs = rhs;
+    rhs = tmp;
+}
+
+#endif // C++11
+
 
 // Comparison operators for the case when wxUniChar(Ref) is the second operand
 // implemented in terms of member comparison functions
diff --git a/include/wx/univ/chkconf.h b/include/wx/univ/chkconf.h
index 45667dc31e..eda435341c 100644
--- a/include/wx/univ/chkconf.h
+++ b/include/wx/univ/chkconf.h
@@ -3,7 +3,7 @@
 // Purpose:     wxUniversal-specific configuration options checks
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28 (extracted from wx/chkconf.h)
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/univ/stdrend.h b/include/wx/univ/stdrend.h
index e781981a8b..c402ad0366 100644
--- a/include/wx/univ/stdrend.h
+++ b/include/wx/univ/stdrend.h
@@ -3,7 +3,7 @@
 // Purpose:     wxStdRenderer class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-09-18
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h
index e6c20c6202..bfc5ac0e46 100644
--- a/include/wx/unix/glx11.h
+++ b/include/wx/unix/glx11.h
@@ -3,7 +3,7 @@
 // Purpose:     class common for all X11-based wxGLCanvas implementations
 // Author:      Vadim Zeitlin
 // Created:     2007-04-15
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/unix/private.h b/include/wx/unix/private.h
index fafc5435db..0227de8762 100644
--- a/include/wx/unix/private.h
+++ b/include/wx/unix/private.h
@@ -3,7 +3,7 @@
 // Purpose:     miscellaneous private things for Unix wx ports
 // Author:      Vadim Zeitlin
 // Created:     2005-09-25
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/unix/private/execute.h b/include/wx/unix/private/execute.h
index e976d154c7..156413cc42 100644
--- a/include/wx/unix/private/execute.h
+++ b/include/wx/unix/private/execute.h
@@ -27,17 +27,17 @@ class wxExecuteData
 public:
     wxExecuteData()
     {
-        flags =
-        pid = 0;
-        exitcode = -1;
+        m_flags =
+        m_pid = 0;
+        m_exitcode = -1;
 
-        process = NULL;
+        m_process = NULL;
 
-        syncEventLoop = NULL;
+        m_syncEventLoop = NULL;
 
 #if wxUSE_STREAMS
-        fdOut =
-        fdErr = wxPipe::INVALID_FD;
+        m_fdOut =
+        m_fdErr = wxPipe::INVALID_FD;
 #endif // wxUSE_STREAMS
     }
 
@@ -51,36 +51,36 @@ public:
     void OnExit(int exitcode);
 
     // Return true if we should (or already did) redirect the child IO.
-    bool IsRedirected() const { return process && process->IsRedirected(); }
+    bool IsRedirected() const { return m_process && m_process->IsRedirected(); }
 
 
     // wxExecute() flags
-    int flags;
+    int m_flags;
 
     // the pid of the child process
-    int pid;
+    int m_pid;
 
     // The exit code of the process, set once the child terminates.
-    int exitcode;
+    int m_exitcode;
 
     // the associated process object or NULL
-    wxProcess *process;
+    wxProcess *m_process;
 
     // Local event loop used to wait for the child process termination in
     // synchronous execution case. We can't create it ourselves as its exact
     // type depends on the application kind (console/GUI), so we rely on
     // wxAppTraits setting up this pointer to point to the appropriate object.
-    wxEventLoopBase *syncEventLoop;
+    wxEventLoopBase *m_syncEventLoop;
 
 #if wxUSE_STREAMS
     // the input buffer bufOut is connected to stdout, this is why it is
     // called bufOut and not bufIn
-    wxStreamTempInputBuffer bufOut,
-                            bufErr;
+    wxStreamTempInputBuffer m_bufOut,
+                            m_bufErr;
 
     // the corresponding FDs, -1 if not redirected
-    int fdOut,
-        fdErr;
+    int m_fdOut,
+        m_fdErr;
 #endif // wxUSE_STREAMS
 
 
diff --git a/include/wx/unix/private/sockunix.h b/include/wx/unix/private/sockunix.h
index 3c0101ee29..05d043d354 100644
--- a/include/wx/unix/private/sockunix.h
+++ b/include/wx/unix/private/sockunix.h
@@ -23,6 +23,8 @@
 
 #include "wx/private/fdiomanager.h"
 
+#define wxCloseSocket close
+
 class wxSocketImplUnix : public wxSocketImpl,
                          public wxFDIOHandler
 {
@@ -64,7 +66,7 @@ private:
     {
         DisableEvents();
 
-        close(m_fd);
+        wxCloseSocket(m_fd);
     }
 
     virtual void UnblockAndRegisterWithEventLoop() wxOVERRIDE
diff --git a/include/wx/unix/stackwalk.h b/include/wx/unix/stackwalk.h
index f7e3a7de41..00c2e085de 100644
--- a/include/wx/unix/stackwalk.h
+++ b/include/wx/unix/stackwalk.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-19
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h
index c6400326d4..45401cff38 100644
--- a/include/wx/unix/stdpaths.h
+++ b/include/wx/unix/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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/wx/utils.h b/include/wx/utils.h
index 7cf8399f18..037bb88582 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -603,6 +603,11 @@ WXDLLIMPEXP_BASE bool wxGetDiskSpace(const wxString& path,
 
 
 
+// See wx/vector.h for more about this hack.
+#ifndef wxQSORT_DECLARED
+
+#define wxQSORT_DECLARED
+
 typedef int (*wxSortCallback)(const void* pItem1,
                               const void* pItem2,
                               const void* user_data);
@@ -612,6 +617,8 @@ WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
                               size_t size, wxSortCallback cmp,
                               const void* user_data);
 
+#endif // !wxQSORT_DECLARED
+
 
 #if wxUSE_GUI // GUI only things from now on
 
diff --git a/include/wx/validate.h b/include/wx/validate.h
index 0fcc58e476..4e6874e5ca 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -97,8 +97,6 @@ private:
     wxDECLARE_NO_ASSIGN_CLASS(wxValidator);
 };
 
-extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
-
 #define wxVALIDATOR_PARAM(val) val
 
 #else // !wxUSE_VALIDATORS
@@ -107,13 +105,13 @@ extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
     // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
     // everywhere
     class WXDLLIMPEXP_FWD_CORE wxValidator;
-    static const wxValidator* const wxDefaultValidatorPtr = NULL;
-    #define wxDefaultValidator (*wxDefaultValidatorPtr)
 
     // this macro allows to avoid warnings about unused parameters when
     // wxUSE_VALIDATORS == 0
     #define wxVALIDATOR_PARAM(val)
 #endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 
+extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
+
 #endif // _WX_VALIDATE_H_
 
diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index 2e05bc6b15..024c383875 100644
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -157,17 +157,33 @@ public:
         this->DoSetMin(min);
     }
 
+    ValueType GetMin() const
+    {
+        return static_cast<ValueType>(this->DoGetMin());
+    }
+
     void SetMax(ValueType max)
     {
         this->DoSetMax(max);
     }
 
+    ValueType GetMax() const
+    {
+        return static_cast<ValueType>(this->DoGetMax());
+    }
+
     void SetRange(ValueType min, ValueType max)
     {
         SetMin(min);
         SetMax(max);
     }
 
+    void GetRange(ValueType& min, ValueType& max) const
+    {
+        min = GetMin();
+        max = GetMax();
+    }
+
     virtual bool TransferToWindow()  wxOVERRIDE
     {
         if ( m_value )
@@ -288,7 +304,9 @@ protected:
     static bool FromString(const wxString& s, LongestValueType *value);
 
     void DoSetMin(LongestValueType min) { m_min = min; }
+    LongestValueType DoGetMin() const { return m_min; }
     void DoSetMax(LongestValueType max) { m_max = max; }
+    LongestValueType DoGetMax() const { return m_max; }
 
     bool IsInRange(LongestValueType value) const
     {
@@ -390,7 +408,9 @@ protected:
     bool FromString(const wxString& s, LongestValueType *value) const;
 
     void DoSetMin(LongestValueType min) { m_min = min; }
+    LongestValueType DoGetMin() const { return m_min; }
     void DoSetMax(LongestValueType max) { m_max = max; }
+    LongestValueType DoGetMax() const { return m_max; }
 
     bool IsInRange(LongestValueType value) const
     {
diff --git a/include/wx/vector.h b/include/wx/vector.h
index 25067081b4..c15d1630a6 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -41,6 +41,13 @@ inline void wxVectorSort(wxVector<T>& v)
 
 // wxQsort is declared in wx/utils.h, but can't include that file here,
 // it indirectly includes this file. Just lovely...
+//
+// Moreover, just declaring it here unconditionally results in gcc
+// -Wredundant-decls warning, so use a preprocessor guard to avoid this.
+#ifndef wxQSORT_DECLARED
+
+#define wxQSORT_DECLARED
+
 typedef int (*wxSortCallback)(const void* pItem1,
                               const void* pItem2,
                               const void* user_data);
@@ -48,6 +55,8 @@ WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
                               size_t size, wxSortCallback cmp,
                               const void* user_data);
 
+#endif // !wxQSORT_DECLARED
+
 namespace wxPrivate
 {
 
diff --git a/include/wx/window.h b/include/wx/window.h
index 3aa36a9fa4..5dbecc519a 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1019,7 +1019,7 @@ public:
 
         // start or end mouse capture, these functions maintain the stack of
         // windows having captured the mouse and after calling ReleaseMouse()
-        // the mouse is not released but returns to the window which had had
+        // the mouse is not released but returns to the window which had
         // captured it previously (if any)
     void CaptureMouse();
     void ReleaseMouse();
diff --git a/include/wx/wupdlock.h b/include/wx/wupdlock.h
index eb799a82e9..8654ef355b 100644
--- a/include/wx/wupdlock.h
+++ b/include/wx/wupdlock.h
@@ -3,7 +3,7 @@
 // Purpose:     wxWindowUpdateLocker prevents window redrawing
 // Author:      Vadim Zeitlin
 // Created:     2006-03-06
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/interface/wx/aboutdlg.h b/interface/wx/aboutdlg.h
index cd43d1bbdc..36ac2ea5c4 100644
--- a/interface/wx/aboutdlg.h
+++ b/interface/wx/aboutdlg.h
@@ -37,7 +37,7 @@
         aboutInfo.SetName("MyApp");
         aboutInfo.SetVersion(MY_APP_VERSION_STRING);
         aboutInfo.SetDescription(_("My wxWidgets-based application!"));
-        aboutInfo.SetCopyright("(C) 1992-2018");
+        aboutInfo.SetCopyright("(C) 1992-2019");
         aboutInfo.SetWebSite("http://myapp.org");
         aboutInfo.AddDeveloper("My Self");
 
diff --git a/interface/wx/clipbrd.h b/interface/wx/clipbrd.h
index 21bd70b19a..d1d337123a 100644
--- a/interface/wx/clipbrd.h
+++ b/interface/wx/clipbrd.h
@@ -96,8 +96,8 @@ public:
         (possibly eating memory), otherwise the clipboard will be emptied on
         exit.
 
-        Currently this method is not implemented in X11-based ports, i.e.
-        wxGTK, wxX11 and wxMotif and always returns @false there.
+        Currently this method is implemented in MSW and GTK and always returns @false
+        otherwise.
 
         @return @false if the operation is unsuccessful for any reason.
     */
diff --git a/interface/wx/clrpicker.h b/interface/wx/clrpicker.h
index 158457f3f7..d7860d6efe 100644
--- a/interface/wx/clrpicker.h
+++ b/interface/wx/clrpicker.h
@@ -11,6 +11,8 @@
 #define wxCLRP_SHOW_ALPHA         0x0010
 
 wxEventType wxEVT_COLOURPICKER_CHANGED;
+wxEventType wxEVT_COLOURPICKER_CURRENT_CHANGED;
+wxEventType wxEVT_COLOURPICKER_DIALOG_CANCELLED;
 
 
 /**
@@ -44,7 +46,20 @@ wxEventType wxEVT_COLOURPICKER_CHANGED;
            The user changed the colour selected in the control either using the
            button or using text control (see @c wxCLRP_USE_TEXTCTRL; note that
            in this case the event is fired only if the user’s input is valid,
-           i.e. recognizable).
+           i.e. recognizable). When using a popup dialog for changing the
+           colour, this event is sent only when the changes in the dialog are
+           accepted by the user, unlike @c EVT_COLOURPICKER_CURRENT_CHANGED.
+    @event{EVT_COLOURPICKER_CURRENT_CHANGED(id, func)}
+           The user changed the currently selected colour in the dialog
+           associated with the control. This event is sent immediately when the
+           selection changes and you must also handle @c EVT_COLOUR_CANCELLED
+           to revert to the previously selected colour if the selection ends up
+           not being accepted. This event is new since wxWidgets 3.1.3 and
+           currently is only implemented in wxMSW.
+    @event{EVT_COLOURPICKER_DIALOG_CANCELLED(id, func)}
+           The user cancelled the colour dialog associated with the control,
+           i.e. closed it without accepting the selection. This event is new
+           since wxWidgets 3.1.3 and currently is only implemented in wxMSW.
     @endEventTable
 
     @library{wxcore}
@@ -124,6 +139,15 @@ public:
     @beginEventTable{wxColourPickerEvent}
     @event{EVT_COLOURPICKER_CHANGED(id, func)}
            Generated whenever the selected colour changes.
+    @event{EVT_COLOURPICKER_CURRENT_CHANGED(id, func)}
+           Generated whenever the currently selected colour in the dialog shown
+           by the picker changes. This event is new since wxWidgets 3.1.3 and
+           currently is only implemented in wxMSW.
+    @event{EVT_COLOURPICKER_DIALOG_CANCELLED(id, func)}
+           Generated when the user cancels the colour dialog associated with
+           the control, i.e. closes it without accepting the selection. This
+           event is new since wxWidgets 3.1.3 and currently is only implemented
+           in wxMSW.
     @endEventTable
 
     @library{wxcore}
diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h
index 7d1faa87e3..b2344e0870 100644
--- a/interface/wx/colordlg.h
+++ b/interface/wx/colordlg.h
@@ -10,11 +10,46 @@
 
     This class represents the colour chooser dialog.
 
+    Starting from wxWidgets 3.1.3 and currently in the MSW port only, this
+    dialog generates wxEVT_COLOUR_CHANGED events while it is being shown, i.e.
+    from inside its ShowModal() method, that notify the program about the
+    change of the currently selected colour and allow it to e.g. preview the
+    effect of selecting this colour. Note that if you react to this event, you
+    should also correctly revert to the previously selected colour if the
+    dialog is cancelled by the user.
+
+    Example of using this class with dynamic feedback for the selected colour:
+    @code
+        // Some function for redrawing using the given colour. Ideally, it
+        // shouldn't do anything if the colour is the same as the one used
+        // before.
+        void Redraw(const wxColour& colour);
+
+        wxColourData data;
+        data.SetColour(initialColourToUse);
+        wxColourData dlg(this, &data);
+        dlg.Bind(wxEVT_COLOUR_CHANGED, [](wxColourDialogEvent& event) {
+                    Redraw(event.GetColour());
+                 });
+        if ( dlg.ShowModal() == wxID_OK ) {
+            // Colour did change.
+        } else {
+            // Colour didn't change.
+        }
+
+        // This call is unnecessary under platforms generating
+        // wxEVT_COLOUR_CHANGED if the dialog was accepted and unnecessary
+        // under the platforms not generating this event if it was cancelled,
+        // so we could check for the different cases explicitly to avoid it,
+        // but it's simpler to just always call it.
+        Redraw(data.GetColour());
+    @endcode
+
     @library{wxcore}
     @category{cmndlg}
 
     @see @ref overview_cmndlg_colour, wxColour, wxColourData,
-         wxGetColourFromUser()
+          wxColourDialogEvent, wxGetColourFromUser()
 */
 class wxColourDialog : public wxDialog
 {
@@ -55,6 +90,47 @@ public:
     virtual int ShowModal();
 };
 
+/**
+    This event class is used for the events generated by wxColourDialog.
+
+    @beginEventTable{wxColourPickerEvent}
+    @event{EVT_COLOUR_CHANGED(id, func)}
+           Generated whenever the currently selected colour in the dialog
+           changes. This event is currently only implemented in wxMSW.
+    @endEventTable
+
+    @library{wxcore}
+    @category{events}
+
+    @see wxColourDialog
+
+    @since 3.1.3
+ */
+class wxColourDialogEvent : public wxCommandEvent
+{
+public:
+    wxColourDialogEvent();
+
+    /**
+        The constructor is not normally used by the user code.
+    */
+    wxColourDialogEvent(wxEventType evtType,
+                        wxColourDialog* dialog,
+                        const wxColour& colour);
+    
+    /**
+        Retrieve the colour the user has just selected.
+    */
+    wxColour GetColour() const;
+
+    /**
+       Set the colour to be sent with the event.
+    */
+    void SetColour(const wxColour& colour);
+};
+
+
+wxEventType wxEVT_COLOUR_CHANGED;
 
 
 // ============================================================================
diff --git a/interface/wx/colour.h b/interface/wx/colour.h
index a3d4ef7afa..7981e0208a 100644
--- a/interface/wx/colour.h
+++ b/interface/wx/colour.h
@@ -158,6 +158,19 @@ public:
     wxUint32 GetRGBA() const;
     //@}
 
+    /**
+        Return the perceived brightness of the colour.
+
+        This value is computed using the simple @code 0.299*R + 0.587*G +
+        0.114*B @endcode formula with the coefficients taken from the RGB to
+        YIQ conversion formula and @c R, @c G and @c B being the values of the
+        corresponding colour channels normalized to 0..1 range, so that the
+        return value is 0 for black and 1 for white.
+
+        @since 3.1.3
+     */
+    double GetLuminance() const;
+
     /**
         Returns a pixel value which is platform-dependent.
         On Windows, a COLORREF is returned.
diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 84238b44df..f577403ed0 100644
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -1400,8 +1400,10 @@ public:
     wxMappingMode GetMapMode() const;
 
     /**
-        Gets in @a colour the colour at the specified location. Not available
-        for wxPostScriptDC or wxMetafileDC.
+        Gets in @a colour the colour at the specified location.
+
+        This method isn't available for wxPostScriptDC or wxMetafileDC nor for
+        any DC in wxOSX port and simply returns @false there.
 
         @note Setting a pixel can be done using DrawPoint().
 
@@ -1799,7 +1801,7 @@ public:
     @category{gdi}
 
     @see wxDC::SetTextForeground(), wxDCFontChanger, wxDCPenChanger, wxDCBrushChanger,
-         wxDCClipper
+         wxDCClipper, wxDCTextBgColourChanger, wxDCBgModeChanger
 */
 class wxDCTextColourChanger
 {
@@ -1842,6 +1844,117 @@ public:
 };
 
 
+/**
+    @class wxDCTextBgColourChanger
+
+    wxDCTextBgColourChanger is a small helper class for setting a background
+    text colour on a wxDC and unsetting it automatically in the destructor,
+    restoring the previous one.
+
+    @library{wxcore}
+    @category{gdi}
+
+    @see wxDC::SetTextBackground(), wxDCFontChanger, wxDCPenChanger, wxDCBrushChanger,
+         wxDCClipper, wxDCTextColourChanger, wxDCBgModeChanger
+
+    @since 3.1.3
+*/
+class wxDCTextBgColourChanger
+{
+public:
+    /**
+        Trivial constructor not changing anything.
+
+        This constructor is useful if you don't know beforehand if the colour
+        needs to be changed or not. It simply creates the object which won't do
+        anything in its destructor unless Set() is called -- in which case it
+        would reset the previous colour.
+     */
+    wxDCTextBgColourChanger(wxDC& dc);
+
+    /**
+        Sets @a col on the given @a dc, storing the old one.
+
+        @param dc
+            The DC where the colour must be temporary set.
+        @param col
+            The text background colour to set.
+    */
+    wxDCTextBgColourChanger(wxDC& dc, const wxColour& col);
+
+    /**
+        Set the background colour to use.
+
+        This method is meant to be called once only and only on the objects
+        created with the constructor overload not taking wxColour argument and
+        has the same effect as the other constructor, i.e. sets the background colour to
+        the given @a col and ensures that the old value is restored when this
+        object is destroyed.
+     */
+    void Set(const wxColour& col);
+
+    /**
+        Restores the background colour originally selected in the DC passed to the ctor.
+    */
+    ~wxDCTextBgColourChanger();
+};
+
+
+/**
+    @class wxDCTextBgModeChanger
+
+    wxDCTextBgModeChanger is a small helper class for setting a background
+    text mode on a wxDC and unsetting it automatically in the destructor,
+    restoring the previous one.
+
+    @library{wxcore}
+    @category{gdi}
+
+    @see wxDC::SetBackgroundMode(), wxDCFontChanger, wxDCPenChanger, wxDCBrushChanger,
+         wxDCClipper, wxDCTextColourChanger, wxDCTextBgColourChanger
+
+    @since 3.1.3
+*/
+class wxDCBgModeChanger
+{
+public:
+    /**
+        Trivial constructor not changing anything.
+
+        This constructor is useful if you don't know beforehand if the background mode
+        needs to be changed or not. It simply creates the object which won't do
+        anything in its destructor unless Set() is called -- in which case it
+        would reset the previous mode.
+     */
+    wxDCBgModeChanger(wxDC& dc);
+
+    /**
+        Sets @a mode on the given @a dc, storing the old one.
+
+        @param dc
+            The DC where the mode must be temporary set.
+        @param mode
+            The background mode to set.
+    */
+    wxDCBgModeChanger(wxDC& dc, int mode);
+
+    /**
+        Set the text background mode to use.
+
+        This method is meant to be called once only and only on the objects
+        created with the constructor overload not taking mode argument and
+        has the same effect as the other constructor, i.e. sets the background mode to
+        the given @a one, and ensures that the old value is restored when this
+        object is destroyed.
+     */
+    void Set(int mode);
+
+    /**
+        Restores the text background mode originally selected in the DC passed to the ctor.
+    */
+    ~wxDCBgModeChanger();
+};
+
 
 /**
     @class wxDCFontChanger
diff --git a/interface/wx/dcgraph.h b/interface/wx/dcgraph.h
index e12a49db61..0f4d75c2bd 100644
--- a/interface/wx/dcgraph.h
+++ b/interface/wx/dcgraph.h
@@ -10,9 +10,27 @@
 
     wxGCDC is a device context that draws on a wxGraphicsContext.
 
-    @remarks
-    If Direct2D is a renderer of underlying graphics context, only wxFont objects
-    representing TrueType fonts can be used in the font-related functions.
+    wxGCDC does its best to implement wxDC API, but the following features are
+    not (fully) implemented because wxGraphicsContext doesn't support them:
+
+    - GetPixel() method is not implemented and always returns @false because
+      modern graphics layers don't support retrieving the contents of the drawn
+      pixels.
+
+    - FloodFill() method is not, and can't be, implemented, as its
+      functionality relies on reading the pixels from wxGraphicsContext too.
+
+    - SetLogicalFunction() method only works with @c wxCOPY, @c wxOR,
+      @c wxNO_OP, @c wxCLEAR and @c wxXOR functions, attempts to use any other
+      function (including @c wxINVERT) don't do anything.
+
+    - Similarly, ::wxRasterOperationMode parameter of Blit() and StretchBlit()
+      can only be one of the supported logical functions listed above, using
+      any other function will result in an assertion failure and not drawing
+      anything.
+
+    - For Direct2D-based wxGraphicsContext, only true-type fonts can be used
+      in the font-related functions.
 
     @library{wxcore}
     @category{dc}
diff --git a/interface/wx/dcsvg.h b/interface/wx/dcsvg.h
index 7ae2f84523..f4d55e22a1 100644
--- a/interface/wx/dcsvg.h
+++ b/interface/wx/dcsvg.h
@@ -28,8 +28,9 @@
     as the SVG file, however it is possible to change this behaviour by
     replacing the built in bitmap handler using wxSVGFileDC::SetBitmapHandler().
 
-    A more substantial SVG library (for reading and writing) is available at
-    the wxArt2D website <http://wxart2d.sourceforge.net/>.
+    More substantial SVG libraries (for reading and writing) are available at
+    <a href="http://wxart2d.sourceforge.net/" target="_blank">wxArt2D</a> and
+    <a href="http://wxsvg.sourceforge.net/" target="_blank">wxSVG</a>.
 
     @library{wxcore}
     @category{dc}
@@ -39,28 +40,13 @@ class wxSVGFileDC : public wxDC
 {
 public:
     /**
-        Initializes a wxSVGFileDC with the given @a f filename with the given
-        @a Width and @a Height at @a dpi resolution, and an optional @a title.
+        Initializes a wxSVGFileDC with the given @a filename, @a width and
+        @a height at @a dpi resolution, and an optional @a title.
         The title provides a readable name for the SVG document.
     */
     wxSVGFileDC(const wxString& filename, int width = 320, int height = 240,
                 double dpi = 72, const wxString& title = wxString());
 
-    /**
-        Destructor.
-    */
-    virtual ~wxSVGFileDC();
-
-    /**
-        Does nothing.
-    */
-    void EndDoc();
-
-    /**
-        Does nothing.
-    */
-    void EndPage();
-
     /**
         Draws a rectangle the size of the SVG using the wxDC::SetBackground() brush.
     */
@@ -88,12 +74,6 @@ public:
     */
     void SetBitmapHandler(wxSVGBitmapHandler* handler);
 
-    /**
-        Does the same as wxDC::SetLogicalFunction(), except that only wxCOPY is
-        available. Trying to set one of the other values will fail.
-    */
-    void SetLogicalFunction(wxRasterOperationMode function);
-
     /**
         Sets the clipping region for this device context to the intersection of
         the given region described by the parameters of this method and the previously
@@ -105,24 +85,6 @@ public:
     void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width,
                            wxCoord height);
 
-    /**
-        This is an overloaded member function, provided for convenience. It differs from the
-        above function only in what argument(s) it accepts.
-    */
-    void SetClippingRegion(const wxPoint& pt, const wxSize& sz);
-
-    /**
-        This is an overloaded member function, provided for convenience. It differs from the
-        above function only in what argument(s) it accepts.
-    */
-    void SetClippingRegion(const wxRect& rect);
-
-    /**
-        This function is not implemented in this DC class.
-        It could be implemented in future if a GetPoints() function were made available on wxRegion.
-    */
-    void SetClippingRegion(const wxRegion& region);
-
     /**
         Destroys the current clipping region so that none of the DC is clipped.
         Since intersections arising from sequential calls to SetClippingRegion are represented
@@ -133,15 +95,20 @@ public:
 
     //@{
     /**
-        Functions not implemented in this DC class.
+        Function not implemented in this DC class.
     */
     void CrossHair(wxCoord x, wxCoord y);
     bool FloodFill(wxCoord x, wxCoord y, const wxColour& colour,
                    wxFloodFillStyle style = wxFLOOD_SURFACE);
-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const;
     bool GetPixel(wxCoord x, wxCoord y, wxColour* colour) const;
     void SetPalette(const wxPalette& palette);
+    int GetDepth() const;
+    void SetLogicalFunction(wxRasterOperationMode function);
+    wxRasterOperationMode GetLogicalFunction() const;
     bool StartDoc(const wxString& message);
+    void EndDoc();
+    void StartPage();
+    void EndPage();
     //@}
 };
 
@@ -203,9 +170,17 @@ public:
 };
 
 /**
-    Handler saving a bitmap to an external file and linking to it from the SVG.
+    Handler saving bitmaps to external PNG files and linking to it from the
+    SVG.
 
-    This handler is used by default by wxSVGFileDC.
+    This handler is used by default by wxSVGFileDC. PNG files are created in
+    the same folder as the SVG file and are named using the SVG filename
+    appended with ``_image#.png``.
+
+    When using wxSVGFileDC::SetBitmapHandler() to set this handler with the
+    default constructor, the PNG files are created in the runtime location of
+    the application. The save location can be customized by using the
+    wxSVGBitmapFileHandler(const wxFileName&) constructor.
 
     @see wxSVGFileDC::SetBitmapHandler().
 
@@ -217,6 +192,17 @@ public:
 class wxSVGBitmapFileHandler : public wxSVGBitmapHandler
 {
 public:
+    /**
+        Create a wxSVGBitmapFileHandler and specify the location where the file
+        will be saved.
+
+        @param path The path of the save location. If @a path contains a
+        filename, the autogenerated filename will be appended to this name.
+
+        @since 3.1.3
+    */
+    wxSVGBitmapFileHandler(const wxFileName& path);
+
     virtual bool ProcessBitmap(const wxBitmap& bitmap,
                                wxCoord x, wxCoord y,
                                wxOutputStream& stream) const;
diff --git a/interface/wx/event.h b/interface/wx/event.h
index dfd7e1b626..e58d756b28 100644
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -3291,7 +3291,25 @@ public:
     wxMouseCaptureLostEvent(wxWindowID windowId = 0);
 };
 
+/**
+    @class wxDisplayChangedEvent
 
+    A display changed event is sent to top-level windows when the display resolution has changed.
+    
+    This event is currently emitted under Windows only.
+
+    @beginEventTable{wxDisplayChangedEvent}
+    @event{EVT_DISPLAY_CHANGED(func)}
+        Process a @c wxEVT_DISPLAY_CHANGED event.
+    @endEventTable
+
+    @onlyfor{wxmsw}
+
+    @library{wxcore}
+    @category{events}
+
+    @see wxDisplay
+*/ 
 
 class wxDisplayChangedEvent : public wxEvent
 {
@@ -4781,7 +4799,7 @@ wxEventType wxNewEventType();
 
     This is mostly used by wxWidgets internally, e.g.
     @code
-    wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_BUTTON, wxCommandEvent)
+    wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_BUTTON, wxCommandEvent);
     @endcode
  */
 #define wxDECLARE_EXPORTED_EVENT( expdecl, name, cls ) \
diff --git a/interface/wx/evtloop.h b/interface/wx/evtloop.h
index 74d0056232..9f4bbade73 100644
--- a/interface/wx/evtloop.h
+++ b/interface/wx/evtloop.h
@@ -189,7 +189,7 @@ public:
     /**
         Makes sure that idle events are sent again.
     */
-    virtual void WakeUpIdle();
+    void WakeUpIdle();
 
     /**
         This virtual function is called  when the application becomes idle and
diff --git a/interface/wx/filedlg.h b/interface/wx/filedlg.h
index 890491d112..10715cb330 100644
--- a/interface/wx/filedlg.h
+++ b/interface/wx/filedlg.h
@@ -210,6 +210,29 @@ public:
     */
     virtual wxString GetCurrentlySelectedFilename() const;
 
+    /**
+        Returns the file type filter index currently selected in dialog.
+
+        Notice that this file type filter is not necessarily going to be the
+        one finally accepted by the user, so calling this function mostly makes
+        sense from an update UI event handler of a custom file dialog extra
+        control to update its state depending on the currently selected file
+        type filter.
+
+        Currently this function is fully implemented only under MSW and
+        always returns @c wxNOT_FOUND elsewhere.
+
+        @since 3.1.3
+
+        @return The 0-based index of the currently selected file type filter or
+            wxNOT_FOUND if nothing is selected.
+
+        @see SetExtraControlCreator()
+        @see GetFilterIndex()
+        @see SetFilterIndex()
+    */
+    virtual int GetCurrentlySelectedFilterIndex () const;
+
     /**
         Returns the default directory.
     */
@@ -399,7 +422,9 @@ wxString wxFileSelector(const wxString& message,
                         int y = wxDefaultCoord);
 
 /**
-    An extended version of wxFileSelector
+    An extended version of wxFileSelector()
+
+    @header{wx/filedlg.h}
 */
 wxString wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                           const wxString& default_path = wxEmptyString,
@@ -412,7 +437,11 @@ wxString wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                           int y = wxDefaultCoord);
 
 /**
-    Ask for filename to load
+    Shows a file dialog asking the user for a file name for opening a file.
+
+    @see wxFileSelector(), wxFileDialog
+
+    @header{wx/filedlg.h}
 */
 wxString wxLoadFileSelector(const wxString& what,
                             const wxString& extension,
@@ -420,7 +449,11 @@ wxString wxLoadFileSelector(const wxString& what,
                             wxWindow *parent = NULL);
 
 /**
-    Ask for filename to save
+    Shows a file dialog asking the user for a file name for saving a file.
+
+    @see wxFileSelector(), wxFileDialog
+
+    @header{wx/filedlg.h}
 */
 wxString wxSaveFileSelector(const wxString& what,
                             const wxString& extension,
diff --git a/interface/wx/gbsizer.h b/interface/wx/gbsizer.h
index 1fd3857d8d..ab0c2f5be2 100644
--- a/interface/wx/gbsizer.h
+++ b/interface/wx/gbsizer.h
@@ -187,7 +187,7 @@ public:
         Called when the managed size of the sizer is needed or when layout
         needs done.
     */
-    void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 
     /**
         Set the size used for cells in the grid with no item.
diff --git a/interface/wx/generic/aboutdlgg.h b/interface/wx/generic/aboutdlgg.h
index a59ad33b0d..e65a056df9 100644
--- a/interface/wx/generic/aboutdlgg.h
+++ b/interface/wx/generic/aboutdlgg.h
@@ -34,7 +34,7 @@
         aboutInfo.SetName("MyApp");
         aboutInfo.SetVersion(MY_APP_VERSION_STRING);
         aboutInfo.SetDescription(_("My wxWidgets-based application!"));
-        aboutInfo.SetCopyright("(C) 1992-2018");
+        aboutInfo.SetCopyright("(C) 1992-2019");
         aboutInfo.SetWebSite("http://myapp.org");
         aboutInfo.AddDeveloper("My Self");
 
diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h
index 78932c0f98..95720f0113 100644
--- a/interface/wx/graphics.h
+++ b/interface/wx/graphics.h
@@ -1359,7 +1359,7 @@ public:
 
         @since 3.1.3
      */
-    static wxGraphicsContext* CreateContextFromUnknownDC(wxDC& dc);
+     wxGraphicsContext* CreateContextFromUnknownDC(wxDC& dc);
 
     /**
         Creates a wxGraphicsContext associated with a wxImage.
diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h
index 6e7d0158fa..5e629c955f 100644
--- a/interface/wx/html/winpars.h
+++ b/interface/wx/html/winpars.h
@@ -59,7 +59,7 @@ public:
         Assigns @a parser to this handler. Each @b instance of handler
         is guaranteed to be called only from the one parser.
     */
-    virtual void SetParser(wxHtmlWinParser* parser);
+    virtual void SetParser(wxHtmlParser* parser);
 
 protected:
     /**
diff --git a/interface/wx/image.h b/interface/wx/image.h
index 055fcbbe77..a64578b02a 100644
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -227,7 +227,7 @@ public:
                 for which this function returns the number of frames in the
                 animation).
     */
-    virtual int GetImageCount(wxInputStream& stream);
+    int GetImageCount(wxInputStream& stream);
 
     /**
         Gets the MIME type associated with this handler.
diff --git a/interface/wx/imaggif.h b/interface/wx/imaggif.h
index b30540a4eb..7b4c76aec7 100644
--- a/interface/wx/imaggif.h
+++ b/interface/wx/imaggif.h
@@ -12,7 +12,7 @@
 
     This is the image handler for the GIF format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagiff.h b/interface/wx/imagiff.h
index fdf19a469d..3670958796 100644
--- a/interface/wx/imagiff.h
+++ b/interface/wx/imagiff.h
@@ -10,7 +10,7 @@
 
     This is the image handler for the IFF format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagjpeg.h b/interface/wx/imagjpeg.h
index 2e68d982db..ac66d825d8 100644
--- a/interface/wx/imagjpeg.h
+++ b/interface/wx/imagjpeg.h
@@ -10,7 +10,7 @@
 
     This is the image handler for the JPEG format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagpcx.h b/interface/wx/imagpcx.h
index b2dcbb7c42..edd3d52759 100644
--- a/interface/wx/imagpcx.h
+++ b/interface/wx/imagpcx.h
@@ -10,7 +10,7 @@
 
     This is the image handler for the PCX format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagpng.h b/interface/wx/imagpng.h
index 7605c5bc69..04a8854017 100644
--- a/interface/wx/imagpng.h
+++ b/interface/wx/imagpng.h
@@ -30,7 +30,7 @@ enum
 
     This is the image handler for the PNG format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagpnm.h b/interface/wx/imagpnm.h
index a538f48f72..849346b70b 100644
--- a/interface/wx/imagpnm.h
+++ b/interface/wx/imagpnm.h
@@ -10,7 +10,7 @@
 
     This is the image handler for the PNM format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagtga.h b/interface/wx/imagtga.h
index dbdd3d9207..b28506ad12 100644
--- a/interface/wx/imagtga.h
+++ b/interface/wx/imagtga.h
@@ -10,7 +10,7 @@
 
     This is the image handler for the TGA format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/imagxpm.h b/interface/wx/imagxpm.h
index dff40ed5a1..525eddea41 100644
--- a/interface/wx/imagxpm.h
+++ b/interface/wx/imagxpm.h
@@ -10,7 +10,7 @@
 
     This is the image handler for the XPM format.
 
-    @library{core}
+    @library{wxcore}
     @category{gdi}
 
     @see wxImage, wxImageHandler, wxInitAllImageHandlers()
diff --git a/interface/wx/intl.h b/interface/wx/intl.h
index 17d42de8d8..8fbe58fbd4 100644
--- a/interface/wx/intl.h
+++ b/interface/wx/intl.h
@@ -367,15 +367,15 @@ public:
     /**
         Calls wxGetTranslation(const wxString&, const wxString&).
     */
-    virtual const wxString& GetString(const wxString& origString,
-                                      const wxString& domain = wxEmptyString) const;
+    const wxString& GetString(const wxString& origString,
+                              const wxString& domain = wxEmptyString) const;
 
     /**
         Calls wxGetTranslation(const wxString&, const wxString&, unsigned, const wxString&).
     */
-    virtual const wxString& GetString(const wxString& origString,
-                                      const wxString& origString2, unsigned n,
-                                      const wxString& domain = wxEmptyString) const;
+    const wxString& GetString(const wxString& origString,
+                              const wxString& origString2, unsigned n,
+                              const wxString& domain = wxEmptyString) const;
 
     /**
         Returns current platform-specific locale name as passed to setlocale().
diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h
index 6692f09907..d90b30d19c 100644
--- a/interface/wx/listctrl.h
+++ b/interface/wx/listctrl.h
@@ -849,8 +849,8 @@ public:
     /**
         For report view mode (only), inserts a column.
 
-        For more details, see SetItem(). Also see InsertColumn(long, const
-        wxString&, int, int) overload for a usually more convenient
+        For more details, see SetItem(). Also see InsertColumn(long, const wxString&, int, int)
+        overload for a usually more convenient
         alternative to this method and the description of how the item width
         is interpreted by this method.
     */
@@ -863,7 +863,7 @@ public:
         given position specifying its most common attributes.
 
         Notice that to set the image for the column you need to use
-        Insert(long, const wxListItem&) overload and specify ::wxLIST_MASK_IMAGE
+        InsertColumn(long, const wxListItem&) overload and specify ::wxLIST_MASK_IMAGE
         in the item mask.
 
         @param col
@@ -1271,6 +1271,13 @@ public:
         @param enable If @true, enable checkboxes, otherwise disable checkboxes.
         @return @true if checkboxes are supported, @false otherwise.
 
+        In a list control with wxLC_VIRTUAL style you have to keep track of the
+        checkbox state. When a checkbox is clicked (EVT_LIST_ITEM_CHECKED
+        or EVT_LIST_ITEM_UNCHECKED) you have to update the state and refresh
+        the item yourself.
+
+        @see OnGetItemIsChecked() RefreshItem()
+
         @since 3.1.0
     */
     bool EnableCheckBoxes(bool enable = true);
@@ -1312,7 +1319,7 @@ protected:
         The base class version always returns @NULL.
 
         @see OnGetItemImage(), OnGetItemColumnImage(), OnGetItemText(),
-             OnGetItemColumnAttr()
+             OnGetItemColumnAttr(), OnGetItemIsChecked()
     */
     virtual wxItemAttr* OnGetItemAttr(long item) const;
 
@@ -1370,6 +1377,17 @@ protected:
         @see SetItemCount(), OnGetItemImage(), OnGetItemColumnImage(), OnGetItemAttr()
     */
     virtual wxString OnGetItemText(long item, long column) const;
+
+    /**
+        This function @b must be overridden in the derived class for a control with
+        @c wxLC_VIRTUAL style that uses checkboxes. It should return whether the
+        checkbox of the specified @c item is checked.
+
+        @see EnableCheckBoxes(), OnGetItemText()
+
+        @since 3.1.2
+    */
+    virtual bool OnGetItemIsChecked(long item) const;
 };
 
 
diff --git a/interface/wx/notifmsg.h b/interface/wx/notifmsg.h
index 4e86a59ca9..0ec049ff44 100644
--- a/interface/wx/notifmsg.h
+++ b/interface/wx/notifmsg.h
@@ -105,7 +105,7 @@ public:
         (e.g. on some systems automatically hidden notifications can't be
         hidden manually).
     */
-    virtual bool Close();
+    bool Close();
 
     /**
         This parameter can be currently used to specify the icon to show in the
@@ -167,7 +167,7 @@ public:
 
         @return @false if an error occurred.
     */
-    virtual bool Show(int timeout = Timeout_Auto);
+    bool Show(int timeout = Timeout_Auto);
 
     /**
         If the application already uses a wxTaskBarIcon, it should be connected
diff --git a/interface/wx/popupwin.h b/interface/wx/popupwin.h
index fe7c92b313..ff0e0892fa 100644
--- a/interface/wx/popupwin.h
+++ b/interface/wx/popupwin.h
@@ -5,6 +5,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxPU_CONTAINS_CONTROLS     0x0001
+
 /**
     @class wxPopupWindow
 
diff --git a/interface/wx/print.h b/interface/wx/print.h
index 83a6b1fcca..62310ba6a3 100644
--- a/interface/wx/print.h
+++ b/interface/wx/print.h
@@ -262,7 +262,7 @@ public:
 
         @since 2.9.2
     */
-    virtual void InitializeWithModality(wxPreviewFrameModalityKind kind);
+    void InitializeWithModality(wxPreviewFrameModalityKind kind);
 
     /**
         Enables any disabled frames in the application, and deletes the print preview
diff --git a/interface/wx/propgrid/advprops.h b/interface/wx/propgrid/advprops.h
index 0e6a9bcc25..7917df020f 100644
--- a/interface/wx/propgrid/advprops.h
+++ b/interface/wx/propgrid/advprops.h
@@ -95,6 +95,9 @@ public:
     @ingroup classes
     Has dropdown list of wxWidgets system colours. Value used is
     of wxColourPropertyValue type.
+
+    <b>Supported special attributes:</b>
+    ::wxPG_COLOUR_ALLOW_CUSTOM, ::wxPG_COLOUR_HAS_ALPHA
 */
 class wxSystemColourProperty : public wxEnumProperty
 {
@@ -168,6 +171,14 @@ protected:
 
 
 
+/** @class wxColourProperty
+    @ingroup classes
+    Allows to select a colour from the list or with colour dialog. Value used
+    is of wxColourPropertyValue type.
+
+    <b>Supported special attributes:</b>
+    ::wxPG_COLOUR_ALLOW_CUSTOM, ::wxPG_COLOUR_HAS_ALPHA
+*/
 class wxColourProperty : public wxSystemColourProperty
 {
 public:
@@ -238,10 +249,10 @@ protected:
     calling wxMultiChoiceProperty::GetValueAsArrayInt().
 
     <b>Supported special attributes:</b>
-    - "UserStringMode": If > 0, allow user to manually enter strings that are
-      not in the list of choices. If this value is 1, user strings are
-      preferably placed in front of valid choices. If value is 2, then those
-      strings will placed behind valid choices.
+    - ::wxPG_ATTR_MULTICHOICE_USERSTRINGMODE: If > 0, allow user to manually
+      enter strings that are not in the list of choices. If this value is 1,
+      user strings are preferably placed in front of valid choices. If value is
+      2, then those strings will placed behind valid choices.
 */
 class wxMultiChoiceProperty : public wxPGProperty
 {
@@ -292,9 +303,9 @@ protected:
     Property representing wxDateTime.
 
     <b>Supported special attributes:</b>
-    - "DateFormat": Determines displayed date format.
-    - "PickerStyle": Determines window style used with wxDatePickerCtrl.
-       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE
+    - ::wxPG_DATE_FORMAT: Determines displayed date format.
+    - ::wxPG_DATE_PICKER_STYLE: Determines window style used with wxDatePickerCtrl.
+       Default is ::wxDP_DEFAULT | ::wxDP_SHOWCENTURY. Using ::wxDP_ALLOWNONE
        enables additional support for unspecified property value.
 */
 class wxDateProperty : public wxPGProperty
diff --git a/interface/wx/propgrid/editors.h b/interface/wx/propgrid/editors.h
index 4af9d0c3e3..d31e794116 100644
--- a/interface/wx/propgrid/editors.h
+++ b/interface/wx/propgrid/editors.h
@@ -136,12 +136,21 @@ public:
         Default implementation  sets foreground colour, background colour,
         font, plus text for wxTextCtrl and wxComboCtrl.
 
+        @param pg
+            Property grid to which the edited property belongs.
+
+        @param property
+            Edited property to which the editor control belongs.
+
+        @param ctrl
+            Editor control.
+
         @param appearance
             New appearance to be applied.
 
         @param oldAppearance
-            Previously applied appearance.  Used to detect which control
-            attributes need to be changed (e.g. so we onlychange background
+            Previously applied appearance. Used to detect which control
+            attributes need to be changed (e.g. so we only change background
             colour if really needed).
 
         @param unspecified
diff --git a/interface/wx/propgrid/manager.h b/interface/wx/propgrid/manager.h
index a51ff229e9..6f60573bd3 100644
--- a/interface/wx/propgrid/manager.h
+++ b/interface/wx/propgrid/manager.h
@@ -27,7 +27,7 @@
 
     wxPropertyGridPage receives events emitted by its wxPropertyGridManager, but
     only those events that are specific to that page. If wxPropertyGridPage::
-    IsHandlingAllEvents returns false, then unhandled events are sent to the
+    IsHandlingAllEvents returns @false, then unhandled events are sent to the
     manager's parent, as usual.
 
     See @ref propgrid_event_handling "wxPropertyGrid Event Handling"
@@ -223,7 +223,7 @@ public:
     /**
        The default constructor. The styles to be used are styles valid for
        the wxWindow.
-       @see @link wndflags Additional Window Styles @endlink
+       @see @ref propgrid_window_styles
     */
     wxPropertyGridManager( wxWindow *parent, wxWindowID id = wxID_ANY,
                            const wxPoint& pos = wxDefaultPosition,
@@ -249,7 +249,7 @@ public:
 
         @param pageObj
             wxPropertyGridPage instance. Manager will take ownership of this
-            object. NULL indicates that a default page instance should be created.
+            object. @NULL indicates that a default page instance should be created.
 
         @return Returns pointer to created property grid page.
 
@@ -431,7 +431,7 @@ public:
     bool IsPageModified( size_t index ) const;
 
     /**
-        Returns true if property is selected. Since selection is page
+        Returns @true if property is selected. Since selection is page
         based, this function checks every page in the manager.
     */
     virtual bool IsPropertySelected( wxPGPropArg id ) const;
@@ -538,7 +538,7 @@ public:
         Show or hide the property grid header control. It is hidden
         by the default.
 
-        @remarks Grid may look better if you use wxPG_NO_INTERNAL_BORDER
+        @remarks Grid may look better if you use ::wxPG_NO_INTERNAL_BORDER
                  window style when showing a header.
     */
     void ShowHeader(bool show = true);
diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 6af7f8ba80..ec87e71071 100644
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -43,6 +43,10 @@ struct wxPGPaintData
     However, some of these constants are redefined to use cached strings which
     may reduce your binary size by some amount.
 
+    If ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES style is applied to
+    wxPropertyGrid, attributes denoted as built-in are not stored into
+    property's attribute storage (thus they are write-only) .
+
     @{
 */
 
@@ -50,15 +54,15 @@ struct wxPGPaintData
 */
 #define wxPG_ATTR_DEFAULT_VALUE           wxS("DefaultValue")
 
-/** Universal, int or double. Minimum value for numeric properties.
+/** Universal, @c int or @c double. Minimum value for numeric properties.
 */
 #define wxPG_ATTR_MIN                     wxS("Min")
 
-/** Universal, int or double. Maximum value for numeric properties.
+/** Universal, @c int or @c double. Maximum value for numeric properties.
 */
 #define wxPG_ATTR_MAX                     wxS("Max")
 
-/** Universal, string. When set, will be shown as text after the displayed
+/** Universal, wxString. When set, will be shown as text after the displayed
     text value. Alternatively, if third column is enabled, text will be shown
     there (for any type of property).
 */
@@ -74,133 +78,143 @@ struct wxPGPaintData
 */
 #define wxPG_ATTR_AUTOCOMPLETE              wxS("AutoComplete")
 
-/** wxBoolProperty and wxFlagsProperty specific. Value type is bool.
-    Default value is False.
+/** wxBoolProperty and wxFlagsProperty specific built-in attribute.
+    Value type is @c bool. Default value is @false.
 
-    When set to True, bool property will use check box instead of a
+    When set to @true, bool property will use check box instead of a
     combo box as its editor control. If you set this attribute
     for a wxFlagsProperty, it is automatically applied to child
     bool properties.
 */
 #define wxPG_BOOL_USE_CHECKBOX              wxS("UseCheckbox")
 
-/** wxBoolProperty and wxFlagsProperty specific. Value type is bool.
-    Default value is False.
+/** wxBoolProperty and wxFlagsProperty specific built-in attribute.
+    Value type is @c bool. Default value is @true.
 
-    Set to True for the bool property to cycle value on double click
+    Set to @true for the bool property to cycle value on double click
     (instead of showing the popup listbox). If you set this attribute
     for a wxFlagsProperty, it is automatically applied to child
     bool properties.
 */
 #define wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING  wxS("UseDClickCycling")
 
-/** wxFloatProperty (and similar) specific, int, default -1. Sets the (max) precision
-    used when floating point value is rendered as text. The default -1 means infinite
-    precision.
+/** wxFloatProperty (and similar) specific built-in attribute of type @c int.
+    Default value is -1. Sets the (max) precision used when floating point
+    value is rendered as text. The default -1 means infinite precision.
 */
 #define wxPG_FLOAT_PRECISION                wxS("Precision")
 
-/** The text will be echoed as asterisks (wxTE_PASSWORD will be passed
-    to textctrl etc.).
+/** Built-in attribute of type @c bool. Default value is @false,
+    When set tu @true, the text will be echoed as asterisks (::wxTE_PASSWORD
+    will be passed to textctrl etc.).
 */
 #define wxPG_STRING_PASSWORD                wxS("Password")
 
-/** Define base used by a wxUIntProperty. Valid constants are
-    wxPG_BASE_OCT, wxPG_BASE_DEC, wxPG_BASE_HEX and wxPG_BASE_HEXL
-    (lowercase characters).
+/** Built-in attribute to define base used by a wxUIntProperty. Valid constants
+    are ::wxPG_BASE_OCT, ::wxPG_BASE_DEC, ::wxPG_BASE_HEX and
+    ::wxPG_BASE_HEXL (lowercase characters).
 */
 #define wxPG_UINT_BASE                      wxS("Base")
 
-/** Define prefix rendered to wxUIntProperty. Accepted constants
-    wxPG_PREFIX_NONE, wxPG_PREFIX_0x, and wxPG_PREFIX_DOLLAR_SIGN.
-    <b>Note:</b> Only wxPG_PREFIX_NONE works with Decimal and Octal
-    numbers.
+/** Built-in attribute to define prefix rendered to wxUIntProperty. Accepted
+    constants ::wxPG_PREFIX_NONE, ::wxPG_PREFIX_0x
+    and ::wxPG_PREFIX_DOLLAR_SIGN.
+
+    @remarks
+    Only ::wxPG_PREFIX_NONE works with decimal and octal numbers.
 */
 #define wxPG_UINT_PREFIX                    wxS("Prefix")
 
-/** wxFileProperty/wxImageFileProperty specific, wxChar*, default is detected/varies.
-    Sets the wildcard used in the triggered wxFileDialog. Format is the
-    same.
+/** wxFileProperty and wxImageFileProperty specific built-in attribute,
+    @c wxChar*, default is detected/varies. Sets the wildcard used in
+    the triggered wxFileDialog. Format is the same.
 */
 #define wxPG_FILE_WILDCARD                  wxS("Wildcard")
 
-/** wxFileProperty/wxImageFileProperty specific, int, default 1.
-    When 0, only the file name is shown (i.e. drive and directory are hidden).
+/** wxFileProperty and wxImageFileProperty specific built-in attribute, @c bool,
+    default @true. When @false, only the file name is shown (i.e. drive and
+    directory are hidden).
 */
 #define wxPG_FILE_SHOW_FULL_PATH            wxS("ShowFullPath")
 
-/** Specific to wxFileProperty and derived properties, wxString, default empty.
-    If set, then the filename is shown relative to the given path string.
+/** Built-in attribute specific to wxFileProperty and derived properties,
+    wxString, default empty. If set, then the filename is shown relative
+    to the given path string.
 */
 #define wxPG_FILE_SHOW_RELATIVE_PATH        wxS("ShowRelativePath")
 
-/** Specific to wxFileProperty and derived properties, wxString, default is empty.
-    Sets the initial path of where to look for files.
+/** Built-in attribute specific to wxFileProperty and derived properties,
+    wxString, default is empty. Sets the initial path of where to look for files.
 */
 #define wxPG_FILE_INITIAL_PATH              wxS("InitialPath")
 
-/** Specific to wxFileProperty and derivatives, wxString, default is empty.
-    Sets a specific title for the dir dialog.
+/** Built-in attribute specific to wxFileProperty and derivatives, wxString,
+    default is empty. Sets a specific title for the dir dialog.
 */
 #define wxPG_FILE_DIALOG_TITLE              wxS("DialogTitle")
 
-/** Specific to wxFileProperty and derivatives, long, default is 0.
-    Sets a specific wxFileDialog style for the file dialog, e.g. ::wxFD_SAVE.
+/** Built-in attribute specific to wxFileProperty and derivatives, @c long,
+    default is 0. Sets a specific wxFileDialog style for the file dialog,
+    e.g. ::wxFD_SAVE.
 
     @since 2.9.4
 */
 #define wxPG_FILE_DIALOG_STYLE              wxS("DialogStyle")
 
-/** Specific to wxDirProperty, wxString, default is empty.
+/** Built-in attribute specific to wxDirProperty, wxString, default is empty.
     Sets a specific message for the dir dialog.
 */
 #define wxPG_DIR_DIALOG_MESSAGE             wxS("DialogMessage")
 
 /**
-    wxArrayStringProperty's string delimiter character. If this is a quotation
-    mark or hyphen, then strings will be quoted instead (with given
-    character).
+    Built-in attribute to set wxArrayStringProperty's string delimiter
+    character. If this is a quotation mark or hyphen, then strings
+    will be quoted instead (with given character).
 
     Default delimiter is quotation mark.
 */
 #define wxPG_ARRAY_DELIMITER                wxS("Delimiter")
 
-/** Sets displayed date format for wxDateProperty.
+/** Built-in attribute to set displayed date format for wxDateProperty.
 */
 #define wxPG_DATE_FORMAT                    wxS("DateFormat")
 
-/** Sets wxDatePickerCtrl window style used with wxDateProperty. Default
-    is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE will enable
-    better unspecified value support in the editor.
+/** Built-in attribute to set wxDatePickerCtrl window style used with
+    wxDateProperty. Default is ::wxDP_DEFAULT | ::wxDP_SHOWCENTURY. Using
+    ::wxDP_ALLOWNONE will enable better unspecified value support
+    in the editor.
 */
 #define wxPG_DATE_PICKER_STYLE              wxS("PickerStyle")
 
-/** SpinCtrl editor, int or double. How much number changes when button is
-    pressed (or up/down on keyboard).
+/** SpinCtrl editor, @c int or @c double. How much number changes when button
+    is pressed (or up/down on keyboard).
 */
 #define wxPG_ATTR_SPINCTRL_STEP             wxS("Step")
 
-/** SpinCtrl editor, bool. If @true, value wraps at Min/Max.
+/** SpinCtrl editor, @c bool. If @true, value wraps at Min/Max.
 */
 #define wxPG_ATTR_SPINCTRL_WRAP             wxS("Wrap")
 
-/** SpinCtrl editor, bool. If @true, value can also by changed by moving
+/** SpinCtrl editor, @c bool. If @true, value can also by changed by moving
     mouse when left mouse button is being pressed.
 */
 #define wxPG_ATTR_SPINCTRL_MOTION           wxS("MotionSpin")
 
-/** wxMultiChoiceProperty, int. If 0, no user strings allowed. If 1, user strings
-    appear before list strings. If 2, user strings appear after list string.
+/** Built-in attribute of wxMultiChoiceProperty, @c int type. Default value
+    is 0. If set to 0, no user strings allowed. If 1, user strings appear
+    before list strings. If 2, user strings appear after list string.
 */
 #define wxPG_ATTR_MULTICHOICE_USERSTRINGMODE    wxS("UserStringMode")
 
-/** wxColourProperty and its kind, int, default 1. Setting this attribute to 0 hides custom
+/** Built-in attribute of wxColourProperty and its kind, type of @c bool,
+    default value is @true. Setting this attribute to @false hides custom
     colour from property's list of choices.
 */
 #define wxPG_COLOUR_ALLOW_CUSTOM            wxS("AllowCustom")
 
 /**
-    wxColourProperty and its kind: Set to True in order to support editing
+    Built-in attribute of wxColourProperty and its kind, @c bool type. Default
+    value is @false. Set this attribute to @true in order to support editing
     alpha colour component.
 */
 #define wxPG_COLOUR_HAS_ALPHA               wxS("HasAlpha")
@@ -432,9 +446,9 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     Simple string property.
 
     Supported special attributes:
-    - @c wxPG_STRING_PASSWORD: Set to @true in order to echo value as asterisks and
-    to use @c wxTE_PASSWORD on the editor (wxTextCtrl).
-    - @c wxPG_ATTR_AUTOCOMPLETE: Set to @true to enable auto-completion
+    - ::wxPG_STRING_PASSWORD: Set to @true in order to echo value as asterisks and
+    to use ::wxTE_PASSWORD on the editor (wxTextCtrl).
+    - ::wxPG_ATTR_AUTOCOMPLETE: Set to @true to enable auto-completion
     (use a wxArrayString value), and is also supported by any property that
     happens to use a wxTextCtrl-based editor.
     @see @ref propgrid_property_attributes
@@ -482,26 +496,26 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     @endcode
 
     Supported special attributes:
-    - @c wxPG_ATTR_MIN, @c wxPG_ATTR_MAX to specify acceptable value range.
+    - ::wxPG_ATTR_MIN, ::wxPG_ATTR_MAX to specify acceptable value range.
 
     @subsection wxUIntProperty
 
     Like wxIntProperty, but displays value as unsigned int. To set
-    the prefix used globally, manipulate @c wxPG_UINT_PREFIX string attribute.
-    To set the globally used base, manipulate @c wxPG_UINT_BASE int
+    the prefix used globally, manipulate ::wxPG_UINT_PREFIX string attribute.
+    To set the globally used base, manipulate ::wxPG_UINT_BASE int
     attribute. Regardless of current prefix, understands (hex) values starting
     with both "0x" and "$" (apart from edit mode).
     Like wxIntProperty, wxUIntProperty seamlessly supports 64-bit unsigned
     integers (i.e. wxULongLong). Same wxVariant safety rules apply.
 
     Supported special attributes:
-    - @c wxPG_ATTR_MIN, @c wxPG_ATTR_MAX: Specifies acceptable value range.
-    - @c wxPG_UINT_BASE: Defines base. Valid constants are @c wxPG_BASE_OCT,
-    @c wxPG_BASE_DEC, @c wxPG_BASE_HEX and @c wxPG_BASE_HEXL (lowercase characters).
+    - ::wxPG_ATTR_MIN, ::wxPG_ATTR_MAX: Specifies acceptable value range.
+    - ::wxPG_UINT_BASE: Defines base. Valid constants are ::wxPG_BASE_OCT,
+    ::wxPG_BASE_DEC, ::wxPG_BASE_HEX and ::wxPG_BASE_HEXL (lowercase characters).
     Arbitrary bases are <b>not</b> supported.
-    - @c wxPG_UINT_PREFIX: Defines displayed prefix. Possible values are
-    @c wxPG_PREFIX_NONE, @c wxPG_PREFIX_0x and @c wxPG_PREFIX_DOLLAR_SIGN.
-    Only @c wxPG_PREFIX_NONE works with decimal and octal numbers.
+    - ::wxPG_UINT_PREFIX: Defines displayed prefix. Possible values are
+    ::wxPG_PREFIX_NONE, ::wxPG_PREFIX_0x and ::wxPG_PREFIX_DOLLAR_SIGN.
+    Only ::wxPG_PREFIX_NONE works with decimal and octal numbers.
     @see @ref propgrid_property_attributes
 
     @remarks
@@ -512,7 +526,7 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
 
     Like wxStringProperty, but converts text to a double-precision floating point.
     Default float-to-text precision is 6 decimals, but this can be changed
-    by modifying @c wxPG_FLOAT_PRECISION attribute.
+    by modifying ::wxPG_FLOAT_PRECISION attribute.
 
     Note that when displaying the value, sign is omitted if the resulting
     textual representation is effectively zero (for example, -0.0001 with
@@ -521,8 +535,8 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     experience in almost all cases.
 
     Supported special attributes:
-    - @c wxPG_ATTR_MIN, @c wxPG_ATTR_MAX: Specifies acceptable value range.
-    - @c wxPG_FLOAT_PRECISION: Sets the (max) precision used when floating point
+    - ::wxPG_ATTR_MIN, ::wxPG_ATTR_MAX: Specifies acceptable value range.
+    - ::wxPG_FLOAT_PRECISION: Sets the (max) precision used when floating point
     value is rendered as text. The default -1 means shortest floating-point
     6-digit representation.
     @see @ref propgrid_property_attributes
@@ -530,13 +544,13 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     @subsection wxBoolProperty
 
     Represents a boolean value. wxChoice is used as editor control, by the
-    default. @c wxPG_BOOL_USE_CHECKBOX attribute can be set to @true in order to
+    default. ::wxPG_BOOL_USE_CHECKBOX attribute can be set to @true in order to
     use check box instead.
 
     Supported special attributes:
-    - @c wxPG_BOOL_USE_CHECKBOX: If set to @true uses check box editor instead
+    - ::wxPG_BOOL_USE_CHECKBOX: If set to @true uses check box editor instead
     of combo box.
-    - @c wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING: If set to @true cycles combo box
+    - ::wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING: If set to @true cycles combo box
     instead showing the list.
     @see @ref propgrid_property_attributes
 
@@ -588,24 +602,25 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     Like wxLongStringProperty, but the button triggers dir selector instead.
 
     Supported special attributes:
-    - @c wxPG_DIR_DIALOG_MESSAGE: Sets specific message in the dir selector.
+    - ::wxPG_DIR_DIALOG_MESSAGE: Sets specific message in the dir selector.
     @see @ref propgrid_property_attributes
 
     @subsection wxFileProperty
 
     Like wxLongStringProperty, but the button triggers file selector instead.
     Default wildcard is "All files..." but this can be changed by setting
-    @c wxPG_FILE_WILDCARD attribute.
+    ::wxPG_FILE_WILDCARD attribute.
 
     Supported special attributes:
-    - @c wxPG_FILE_WILDCARD: Sets wildcard (see wxFileDialog for format details), "All
+    - ::wxPG_FILE_WILDCARD: Sets wildcard (see wxFileDialog for format details), "All
     files..." is default.
-    - @c wxPG_FILE_SHOW_FULL_PATH: Default @true. When @false, only the file name is shown
+    - ::wxPG_FILE_SHOW_FULL_PATH: Default @true. When @false, only the file name is shown
     (i.e. drive and directory are hidden).
-    - @c wxPG_FILE_SHOW_RELATIVE_PATH: If set, then the filename is shown relative to the
+    - ::wxPG_FILE_SHOW_RELATIVE_PATH: If set, then the filename is shown relative to the
     given path string.
-    - @c wxPG_FILE_INITIAL_PATH: Sets the initial path of where to look for files.
-    - @c wxPG_FILE_DIALOG_TITLE: Sets a specific title for the dir dialog.
+    - ::wxPG_FILE_INITIAL_PATH: Sets the initial path of where to look for files.
+    - ::wxPG_FILE_DIALOG_TITLE: Sets a specific title for the dir dialog.
+    - ::wxPG_FILE_DIALOG_STYLE: Sets a specific wxFileDialog style for the file dialog.
     @see @ref propgrid_property_attributes
 
     @subsection wxEnumProperty
@@ -632,7 +647,7 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     of strings in wxTextCtrl and in a separate dialog.
 
     Supported special attributes:
-    - @c wxPG_ARRAY_DELIMITER: Sets string delimiter character.
+    - ::wxPG_ARRAY_DELIMITER: Sets string delimiter character.
     Default is comma (',').
     @see @ref propgrid_property_attributes
 
@@ -642,10 +657,10 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     although TextCtrl should work as well.
 
     Supported special attributes:
-    - @c wxPG_DATE_FORMAT: Determines displayed date format (with wxDateTime::Format).
+    - ::wxPG_DATE_FORMAT: Determines displayed date format (with wxDateTime::Format).
     Default is recommended as it is locale-dependent.
-    - @c wxPG_DATE_PICKER_STYLE: Determines window style used with wxDatePickerCtrl.
-       Default is @c wxDP_DEFAULT | @c wxDP_SHOWCENTURY. Using @c wxDP_ALLOWNONE
+    - ::wxPG_DATE_PICKER_STYLE: Determines window style used with wxDatePickerCtrl.
+       Default is ::wxDP_DEFAULT | ::wxDP_SHOWCENTURY. Using ::wxDP_ALLOWNONE
        enables additional support for unspecified property value.
     @see @ref propgrid_property_attributes
 
@@ -665,7 +680,7 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     It uses wxArrayString value.
 
     Supported special attributes:
-    - @c wxPG_ATTR_MULTICHOICE_USERSTRINGMODE: If > 0, allows user to manually
+    - ::wxPG_ATTR_MULTICHOICE_USERSTRINGMODE: If > 0, allows user to manually
     enter strings that are not in the list of choices. If this value is 1,
     user strings are preferably placed in front of valid choices. If value
     is 2, then those strings will placed behind valid choices.
@@ -686,7 +701,7 @@ wxPG_PROP_CLASS_SPECIFIC_3          = 0x00400000
     below in wxSystemColourProperty section for details.
 
     Supported special attributes:
-    - @c wxPG_COLOUR_HAS_ALPHA: If set to @true allows user to edit the alpha
+    - ::wxPG_COLOUR_HAS_ALPHA: If set to @true allows user to edit the alpha
     colour component.
     @see @ref propgrid_property_attributes
 
@@ -908,9 +923,9 @@ public:
             Text to be translated into variant.
 
         @param argFlags
-            If wxPG_FULL_VALUE is set, returns complete, storable value instead
+            If ::wxPG_FULL_VALUE is set, returns complete, storable value instead
             of displayable one (they may be different).
-            If wxPG_COMPOSITE_FRAGMENT is set, text is interpreted as a part of
+            If ::wxPG_COMPOSITE_FRAGMENT is set, text is interpreted as a part of
             composite property string value (as generated by ValueToString()
             called with this same flag).
 
@@ -935,7 +950,7 @@ public:
         @param number
             Integer to be translated into variant.
         @param argFlags
-            If wxPG_FULL_VALUE is set, returns complete, storable value instead
+            If ::wxPG_FULL_VALUE is set, returns complete, storable value instead
             of displayable one.
 
         @return Returns @true if resulting wxVariant value was different.
@@ -960,10 +975,10 @@ public:
             Value to be converted.
         @param argFlags
             If 0 (default value), then displayed string is returned.
-            If wxPG_FULL_VALUE is set, returns complete, storable string value
-            instead of displayable. If wxPG_EDITABLE_VALUE is set, returns
+            If ::wxPG_FULL_VALUE is set, returns complete, storable string value
+            instead of displayable. If ::wxPG_EDITABLE_VALUE is set, returns
             string value that must be editable in textctrl.
-            If wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
+            If ::wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
             display as a part of string property's composite text representation.
 
         @remarks Default implementation calls GenerateComposedValue().
@@ -977,12 +992,12 @@ public:
         @param text
             String to get the value from.
         @param flags
-            If @c wxPG_FULL_VALUE is set, the function sets complete, storable
+            If ::wxPG_FULL_VALUE is set, the function sets complete, storable
             value instead of displayable one (they may be different).
-            @c wxPG_PROGRAMMATIC_VALUE flag is used to indicate that value is
+            ::wxPG_PROGRAMMATIC_VALUE flag is used to indicate that value is
             being set programmatically (i.e. operation is not caused by user
             input).
-            If @c wxPG_REPORT_ERROR is set, a special action should be
+            If ::wxPG_REPORT_ERROR is set, a special action should be
             performed if string couldn't have been successfully converted
             to the valid value (e.g. a special value can be set in this case).
 
@@ -997,7 +1012,7 @@ public:
         @param value
             Int to get the value from.
         @param flags
-            If has wxPG_FULL_VALUE, then the value given is a actual value and not an index.
+            If has ::wxPG_FULL_VALUE, then the value given is a actual value and not an index.
 
         @return @true if value was changed.
     */
@@ -1014,7 +1029,7 @@ public:
         @remarks
         - Default behaviour is to return wxSize(0,0), which means no image.
         - Default image width or height is indicated with dimension -1.
-        - You can also return wxPG_DEFAULT_IMAGE_SIZE which equals wxDefaultSize.
+        - You can also return ::wxPG_DEFAULT_IMAGE_SIZE which equals wxDefaultSize.
     */
     virtual wxSize OnMeasureImage( int item = -1 ) const;
 
@@ -1146,7 +1161,7 @@ public:
         than row height).
 
         NOTE: Following applies when OnMeasureImage() returns a "flexible" height (
-        using wxPG_FLEXIBLE_SIZE(W,H) macro), which implies variable height items:
+        using @c wxPG_FLEXIBLE_SIZE(W,H) macro), which implies variable height items:
         If (rect.x+rect.width) is < 0, then this is a measure item call, which
         means that dc is invalid and only thing that should be done is to set
         paintdata.m_drawnHeight to the height of the image of item at index
@@ -1280,7 +1295,7 @@ public:
         Adds a private child property. If you use this instead of
         wxPropertyGridInterface::Insert() or
         wxPropertyGridInterface::AppendIn(), then property's parental
-        type will automatically be set up to wxPG_PROP_AGGREGATE. In other
+        type will automatically be set up to ::wxPG_PROP_AGGREGATE. In other
         words, all properties of this property will become private.
     */
     void AddPrivateChild( wxPGProperty* prop );
@@ -1325,7 +1340,8 @@ public:
         @remarks Setting a property flag never has any side-effect, and is
                  intended almost exclusively for internal use. So, for
                  example, if you want to disable a property, call
-                 Enable(false) instead of setting wxPG_PROP_DISABLED flag.
+                 @code Enable(false) @endcode instead of setting
+                 ::wxPG_PROP_DISABLED flag.
 
         @see HasFlag(), GetFlags()
     */
@@ -1375,28 +1391,52 @@ public:
 
     /**
         Returns property attribute value, null variant if not found.
+
+        @remarks
+        For built-in atrribute returns null variant if extra style
+        ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set.
     */
     wxVariant GetAttribute( const wxString& name ) const;
 
-    /** Returns named attribute, as string, if found. Otherwise defVal is returned.
+    /** Returns named attribute, as string, if found. Otherwise @a defVal is returned.
+
+        @remarks
+        For built-in atrribute returns @a defVal if extra style
+        ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set.
     */
     wxString GetAttribute( const wxString& name, const wxString& defVal ) const;
 
-    /** Returns named attribute, as long, if found. Otherwise defVal is returned.
+    /** Returns named attribute, as long, if found. Otherwise @a defVal is returned.
+
+        @remarks
+        For built-in atrribute returns @a defVal if extra style
+        ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set.
     */
     long GetAttributeAsLong( const wxString& name, long defVal ) const;
 
-    /** Returns named attribute, as double, if found. Otherwise defVal is returned.
+    /** Returns named attribute, as double, if found. Otherwise @a defVal is returned.
+
+        @remarks
+        For built-in atrribute returns @a defVal if extra style
+        ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set.
     */
     double GetAttributeAsDouble( const wxString& name, double defVal ) const;
 
     /**
-        Returns comma-delimited string of property attributes.
+        Returns map-like storage of property's attributes.
+
+        @remarks
+        If extra style ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set,
+        then builtin-attributes are not included in the storage.
     */
     const wxPGAttributeStorage& GetAttributes() const;
 
     /**
         Returns attributes as list wxVariant.
+
+        @remarks
+        If extra style ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set,
+        then builtin-attributes are not included in the list.
     */
     wxVariant GetAttributesAsList() const;
 
@@ -1538,7 +1578,14 @@ public:
     */
     wxPGProperty* GetMainParent() const;
 
-    /** Returns maximum allowed length of property's text value.
+    /**
+        Returns maximum allowed length of the text the user can enter in
+        the property text editor.
+
+        @remarks
+        0 is returned if length is not explicitly limited and the text can be
+        as long as it is supported by the underlying native text control
+        widget.
     */
     int GetMaxLength() const;
 
@@ -1550,6 +1597,9 @@ public:
 
     /**
         Returns (direct) child property with given name (or @NULL if not found).
+
+        @param name
+            Name of the child property to look for.
     */
     wxPGProperty* GetPropertyByName( const wxString& name ) const;
 
@@ -1571,10 +1621,10 @@ public:
 
         @param argFlags
             If 0 (default value), then displayed string is returned.
-            If wxPG_FULL_VALUE is set, returns complete, storable string value
-            instead of displayable. If wxPG_EDITABLE_VALUE is set, returns
+            If ::wxPG_FULL_VALUE is set, returns complete, storable string value
+            instead of displayable. If ::wxPG_EDITABLE_VALUE is set, returns
             string value that must be editable in textctrl. If
-            wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
+            ::wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
             display as a part of string property's composite text
             representation.
 
@@ -1642,7 +1692,8 @@ public:
             @true for hide, @false for reveal.
 
         @param flags
-            By default changes are applied recursively. Set this parameter wxPG_DONT_RECURSE to prevent this.
+            By default changes are applied recursively. Set this parameter to
+            ::wxPG_DONT_RECURSE to prevent this.
     */
     bool Hide( bool hide, int flags = wxPG_RECURSE );
 
@@ -1713,7 +1764,7 @@ public:
     bool IsSomeParent( wxPGProperty* candidateParent ) const;
 
     /**
-        Returns true if property has editable wxTextCtrl when selected.
+        Returns @true if property has editable wxTextCtrl when selected.
 
         @remarks Although disabled properties do not displayed editor, they still
                 return @true here as being disabled is considered a temporary
@@ -1728,12 +1779,12 @@ public:
     bool IsValueUnspecified() const;
 
     /**
-        Returns true if all parents expanded.
+        Returns @true if all parents expanded.
     */
     bool IsVisible() const;
 
     /**
-        Returns child property at index i.
+        Returns child property at index @a i.
     */
     wxPGProperty* Item( unsigned int i ) const;
 
@@ -1744,7 +1795,7 @@ public:
 
     /**
         If property's editor is created this forces its recreation.
-        Useful in SetAttribute etc. Returns true if actually did anything.
+        Useful in SetAttribute etc. Returns @true if actually did anything.
     */
     bool RecreateEditor();
 
@@ -1788,7 +1839,7 @@ public:
             Background colour to use.
 
         @param flags
-            Default is wxPG_RECURSE which causes colour to be set recursively.
+            Default is ::wxPG_RECURSE which causes colour to be set recursively.
             Omit this flag to only set colour for the property in question
             and not any of its children.
 
@@ -1893,7 +1944,12 @@ public:
     void SetLabel( const wxString& label );
 
     /**
-        Set max length of text in text editor.
+        Set maximum length of the text the user can enter in the text editor.
+        If it is 0, the length is not limited and the text can be as long as
+        it is supported by the underlying native text control widget.
+
+        @return
+        Returns @true if maximum length was set.
     */
     bool SetMaxLength( int maxLen );
 
@@ -1911,9 +1967,9 @@ public:
         Changes what sort of parent this property is for its children.
 
         @param flag
-            Use one of the following values: wxPG_PROP_MISC_PARENT (for generic
-            parents), wxPG_PROP_CATEGORY (for categories), or
-            wxPG_PROP_AGGREGATE (for derived property classes with private
+            Use one of the following values: ::wxPG_PROP_MISC_PARENT (for generic
+            parents), ::wxPG_PROP_CATEGORY (for categories), or
+            ::wxPG_PROP_AGGREGATE (for derived property classes with private
             children).
 
         @remarks You generally do not need to call this function.
@@ -1927,7 +1983,7 @@ public:
             Text colour to use.
 
         @param flags
-            Default is wxPG_RECURSE which causes colour to be set recursively.
+            Default is ::wxPG_RECURSE which causes colour to be set recursively.
             Omit this flag to only set colour for the property in question
             and not any of its children.
 
@@ -1942,7 +1998,7 @@ public:
         Sets property's default text and background colours.
 
         @param flags
-            Default is wxPG_RECURSE which causes colours to be set recursively.
+            Default is ::wxPG_RECURSE which causes colours to be set recursively.
             Omit this flag to only set colours for the property in question
             and not any of its children.
 
@@ -1972,7 +2028,7 @@ public:
             Pointer to list variant that contains child values. Used to indicate
             which children should be marked as modified. Usually you just use @NULL.
         @param flags
-            wxPG_SETVAL_REFRESH_EDITOR is set by default, to refresh editor
+            ::wxPG_SETVAL_REFRESH_EDITOR is set by default, to refresh editor
             and redraw properties.
     */
     void SetValue( wxVariant value, wxVariant* pList = NULL,
@@ -2014,7 +2070,7 @@ public:
     wxPGProperty* UpdateParentValues();
 
     /**
-        Returns @true if containing grid uses wxPG_EX_AUTO_UNSPECIFIED_VALUES.
+        Returns @true if containing grid uses ::wxPG_EX_AUTO_UNSPECIFIED_VALUES.
     */
     bool UsesAutoUnspecified() const;
 
@@ -2065,6 +2121,9 @@ protected:
     /**
         Clear cells associated with property.
 
+        @param ignoreWithFlags
+            Cells will not be cleared for properties having these flags set. 
+
         @param recursively
             If @true, apply this operation recursively in child properties.
     */
@@ -2078,11 +2137,14 @@ protected:
     /** Returns (direct) child property with given name (or @NULL if not found),
         with hint index.
 
+        @param name
+            Name of the child property to look for.
+
         @param hintIndex
-        Start looking for the child at this index.
+            Start looking for the child at this index.
 
         @remarks
-        Does not support scope (i.e. Parent.Child notation).
+            Does not support scope (i.e. Parent.Child notation).
     */
     wxPGProperty* GetPropertyByNameWH( const wxString& name,
                                        unsigned int hintIndex ) const;
@@ -2096,7 +2158,7 @@ protected:
     void Empty();
 
     /**
-        Returns true if child property is selected.
+        Returns @true if child property is selected.
     */
     bool IsChildSelected( bool recursive = false ) const;
 };
@@ -2168,6 +2230,24 @@ public:
         Returns @true if rendered something in the foreground (text or
         bitmap).
 
+        @param dc
+            wxDC to paint on.
+
+        @param rect
+            Box reserved for drawing.
+
+        @param propertyGrid
+            Property grid in which property is displayed.
+
+        @param property
+            Property to be rendered.
+
+        @param column
+            Property cell column.
+
+        @param item
+            Index of chosen item if combo popup is drawn, -1 otherwise.
+
         @param flags
             See @ref pgcellrenderer_render_flags "list of render flags".
     */
@@ -2210,14 +2290,25 @@ public:
                           wxPGProperty* property,
                           const wxPGEditor* editor ) const;
 
-    /** Utility to render cell bitmap and set text colour plus bg brush
+    /**
+        Utility to render cell bitmap and set text colour plus bg brush
         colour.
 
+        @param dc
+            wxDC to paint on.
+
+        @param rect
+            Box reserved for drawing.
+
+        @param cell
+            Cell information.
+
         @param flags
             See @ref pgcellrenderer_render_flags "list of render flags".
 
-        @return Returns image width, which, for instance, can be passed to
-                DrawText.
+        @return
+            Returns image width, which, for instance, can be passed to
+            DrawText().
     */
     int PreDrawCell( wxDC& dc,
                      const wxRect& rect,
@@ -2228,6 +2319,15 @@ public:
         Utility to be called after drawing is done, to revert whatever
         changes PreDrawCell() did.
 
+        @param dc
+            wxDC which was used to paint on.
+
+        @param propGrid
+            Property grid to which the cell belongs.
+
+        @param cell
+            Cell information.
+
         @param flags
             Same as those passed to PreDrawCell().
             See @ref pgcellrenderer_render_flags "list of render flags".
@@ -2256,6 +2356,24 @@ public:
         Returns @true if rendered something in the foreground (text or
         bitmap.
 
+        @param dc
+            wxDC to paint on.
+
+        @param rect
+            Box reserved for drawing.
+
+        @param propertyGrid
+            Property grid in which property is displayed.
+
+        @param property
+            Property to be rendered.
+
+        @param column
+            Property cell column.
+
+        @param item
+            Index of chosen item if combo popup is drawn, -1 otherwise.
+
         @param flags
             See @ref pgcellrenderer_render_flags "list of render flags".
     */
@@ -2301,7 +2419,7 @@ protected:
     wxColour    m_bgCol;
     wxFont      m_font;
 
-    /** True if m_text is valid and specified.
+    /** @true if m_text is valid and specified.
     */
     bool        m_hasValidText;
 };
@@ -2645,7 +2763,7 @@ public:
 
     /**
         Returns array of values matching the given strings. Unmatching strings
-        result in wxPG_INVALID_VALUE entry in array.
+        result in ::wxPG_INVALID_VALUE entry in array.
     */
     wxArrayInt GetValuesForStrings( const wxArrayString& strings ) const;
 
diff --git a/interface/wx/propgrid/propgrid.h b/interface/wx/propgrid/propgrid.h
index 7f28cab079..a3650155af 100644
--- a/interface/wx/propgrid/propgrid.h
+++ b/interface/wx/propgrid/propgrid.h
@@ -534,8 +534,7 @@ typedef int (*wxPGSortCallback)(wxPropertyGrid* propGrid,
     @category{propgrid}
     @appearance{propertygrid}
 */
-class wxPropertyGrid : public wxControl,
-                       public wxScrollHelper,
+class wxPropertyGrid : public wxScrolled<wxControl>,
                        public wxPropertyGridInterface
 {
 public:
@@ -583,7 +582,7 @@ public:
     void AddActionTrigger( int action, int keycode, int modifiers = 0 );
 
     /**
-        Adds given property into selection. If wxPG_EX_MULTIPLE_SELECTION
+        Adds given property into selection. If ::wxPG_EX_MULTIPLE_SELECTION
         extra style is not used, then this has same effect as
         calling SelectProperty().
 
@@ -592,7 +591,7 @@ public:
                  add category to selection, and also if you have category
                  selected, you cannot add other properties to selection.
                  This member function will fail silently in these cases,
-                 even returning true.
+                 even returning @true.
     */
     bool AddToSelection( wxPGPropArg id );
 
@@ -601,7 +600,7 @@ public:
         wxGetTranslation() for following strings: wxEnumProperty list labels,
         wxFlagsProperty child property labels.
 
-        Default is false.
+        Default is @false.
     */
     static void AutoGetTranslation( bool enable );
 
@@ -625,7 +624,7 @@ public:
         SetPropertyValue() if you need the value to run through validation
         process, and also send the property change event.
 
-        @return Returns true if value was successfully changed.
+        @return Returns @true if value was successfully changed.
     */
     bool ChangePropertyValue( wxPGPropArg id, wxVariant newValue );
 
@@ -634,7 +633,7 @@ public:
 
         @param enableAutoResizing
             If @true, automatic column resizing is enabled (only applicable
-            if window style wxPG_SPLITTER_AUTO_CENTER is used).
+            if window style ::wxPG_SPLITTER_AUTO_CENTER is used).
     */
     void CenterSplitter( bool enableAutoResizing = false );
 
@@ -688,7 +687,7 @@ public:
         enable.
 
         @remarks This functions deselects selected property, if any. Validation
-                failure option wxPG_VFB_STAY_IN_PROPERTY is not respected, i.e.
+                failure option ::wxPG_VFB_STAY_IN_PROPERTY is not respected, i.e.
                 selection is cleared even if editor had invalid value.
     */
     bool EnableCategories( bool enable );
@@ -717,7 +716,7 @@ public:
 
         @return Minimum size for the grid to still display everything.
 
-        @remarks Does not work well with wxPG_SPLITTER_AUTO_CENTER window style.
+        @remarks Does not work well with ::wxPG_SPLITTER_AUTO_CENTER window style.
 
                 This function only works properly if grid size prior to call was
                 already fairly large.
@@ -919,7 +918,7 @@ public:
     wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
 
     /**
-        Returns true if any property has been modified by the user.
+        Returns @true if any property has been modified by the user.
     */
     bool IsAnyModified() const;
 
@@ -929,7 +928,7 @@ public:
     bool IsEditorFocused() const;
 
     /**
-        Returns true if updating is frozen (i.e. Freeze() called but not
+        Returns @true if updating is frozen (i.e. Freeze() called but not
         yet Thaw() ).
     */
     bool IsFrozen() const;
@@ -998,7 +997,7 @@ public:
 
         @param enableAutoResizing
             If @true, automatic column resizing is enabled (only applicable
-            if window style wxPG_SPLITTER_AUTO_CENTER is used).
+            if window style ::wxPG_SPLITTER_AUTO_CENTER is used).
 
         @see wxPropertyGridInterface::SetColumnProportion()
     */
@@ -1012,7 +1011,7 @@ public:
 
     /**
         Selects a property. Editor widget is automatically created, but
-        not focused unless focus is true.
+        not focused unless focus is @true.
 
         @param id
             Property to select (name or pointer).
@@ -1232,10 +1231,15 @@ public:
     virtual wxStatusBar* GetStatusBar();
 
     /** Override to customize property validation failure behaviour.
+
+        @param
+            property Property with entered an invalid value
+
         @param invalidValue
             Value which failed in validation.
+
         @return
-            Return true if user is allowed to change to another property even
+            Return @true if user is allowed to change to another property even
             if current has invalid value.
     */
     virtual bool DoOnValidationFailure( wxPGProperty* property,
@@ -1243,7 +1247,7 @@ public:
 
     /** Override to customize resetting of property validation failure status.
         @remarks
-        Property is guaranteed to have flag wxPG_PROP_INVALID_VALUE set.
+        Property is guaranteed to have flag ::wxPG_PROP_INVALID_VALUE set.
     */
     virtual void DoOnValidationFailureReset( wxPGProperty* property );
 
@@ -1284,7 +1288,7 @@ public:
     wxVariant GetUncommittedPropertyValue();
 
     /**
-        Returns true if editor's value was marked modified.
+        Returns @true if editor's value was marked modified.
     */
     bool IsEditorsValueModified() const;
 
@@ -1295,7 +1299,7 @@ public:
 
     /**
         Call this from wxPGProperty::OnEvent() to cause property value to be
-        changed after the function returns (with true as return value).
+        changed after the function returns (with @true as return value).
         ValueChangeInEvent() must be used if you wish the application to be
         able to use wxEVT_PG_CHANGING to potentially veto the given value.
     */
@@ -1308,7 +1312,7 @@ public:
         if was value was changed using wxPGProperty::SetValueInEvent(), which
         is usually used when a 'picker' dialog is displayed. If value was
         written by "normal means" in wxPGProperty::StringToValue() or
-        IntToValue(), then this function will return false (on the other hand,
+        IntToValue(), then this function will return @false (on the other hand,
         wxPGProperty::OnEvent() is not even called in those cases).
     */
     bool WasValueChangedInEvent() const;
@@ -1340,7 +1344,7 @@ public:
     ~wxPropertyGridEvent();
 
     /**
-        Returns true if you can veto the action that the event is signaling.
+        Returns @true if you can veto the action that the event is signaling.
     */
     bool CanVeto() const;
 
@@ -1420,14 +1424,14 @@ public:
 
     /**
         Sets custom failure message for this time only. Only applies if
-        wxPG_VFB_SHOW_MESSAGE is set in validation failure flags.
+        ::wxPG_VFB_SHOW_MESSAGE is set in validation failure flags.
     */
     void SetValidationFailureMessage( const wxString& message );
 
     /**
         Call this from your event handler to veto action that the event is
         signaling. You can only veto a shutdown if wxPropertyGridEvent::CanVeto()
-        returns true.
+        returns @true.
 
         @remarks Currently only @c wxEVT_PG_CHANGING supports vetoing.
     */
@@ -1480,8 +1484,21 @@ public:
 
     /**
         Appends a new property under bottommost parent.
+
         @param propClass
-        Property class as string.
+            Property class as string.
+
+        @param propLabel
+            Property label.
+
+        @param propName
+            Property name.
+
+        @param propValue
+            Property value.
+
+        @param pChoices
+            Set of choices for the property (optional).
     */
     wxPGProperty* Add( const wxString& propClass,
                        const wxString& propLabel,
@@ -1499,9 +1516,16 @@ public:
 
     /**
         Adds attribute to the bottommost property.
+
+        @param name
+            Attribute name.
+
         @param type
-        Allowed values: "string", (same as string), "int", "bool". Empty string
-        mean autodetect.
+            Allowed values: @c "string", (same as string), @c "int", @c "bool".
+            Empty string means autodetect.
+
+        @param value
+            Attribute value.
     */
     bool AddAttribute( const wxString& name,
                        const wxString& type,
diff --git a/interface/wx/propgrid/propgriddefs.h b/interface/wx/propgrid/propgriddefs.h
index 084118b9ba..c6b4c00db6 100644
--- a/interface/wx/propgrid/propgriddefs.h
+++ b/interface/wx/propgrid/propgriddefs.h
@@ -8,16 +8,12 @@
 
 // -----------------------------------------------------------------------
 
-/** @section propgrid_misc wxPropertyGrid Miscellanous
-
-    This section describes some miscellanous values, types and macros.
-    @{
+/** Used to tell wxPGProperty to use label as name as well
 */
-
-// Used to tell wxPGProperty to use label as name as well
 #define wxPG_LABEL              (*wxPGProperty::sm_wxPG_LABEL)
 
-// This is the value placed in wxPGProperty::sm_wxPG_LABEL
+/** This is the value placed in wxPGProperty::sm_wxPG_LABEL
+*/
 #define wxPG_LABEL_STRING       wxS("@!")
 #define wxPG_NULL_BITMAP        wxNullBitmap
 #define wxPG_COLOUR_BLACK       (*wxBLACK)
@@ -28,17 +24,17 @@
 
 
 /** If property is supposed to have custom-painted image, then returning
-    this in OnMeasureImage() will usually be enough.
+    this in wxPGProperty::OnMeasureImage() will usually be enough.
 */
-#define wxPG_DEFAULT_IMAGE_SIZE             wxSize(-1, -1)
+#define wxPG_DEFAULT_IMAGE_SIZE             wxDefaultSize
 
 
 /** This callback function is used for sorting properties.
 
     Call wxPropertyGrid::SetSortFunction() to set it.
 
-    Sort function should return a value greater than 0 if position of p1 is
-    after p2. So, for instance, when comparing property names, you can use
+    Sort function should return a value greater than 0 if position of @a p1 is
+    after @a p2. So, for instance, when comparing property names, you can use
     following implementation:
 
         @code
@@ -54,105 +50,150 @@ typedef int (*wxPGSortCallback)(wxPropertyGrid* propGrid,
                                 wxPGProperty* p1,
                                 wxPGProperty* p2);
 
-
-
-typedef wxString wxPGCachedString;
-
-/** @}
-*/
-
 // -----------------------------------------------------------------------
 
-// Used to indicate wxPGChoices::Add etc that the value is actually not given
-// by the caller.
+/** Used to indicate wxPGChoices::Add() etc that the value is actually not given
+    by the caller.
+*/
 #define wxPG_INVALID_VALUE      INT_MAX
 
 // -----------------------------------------------------------------------
 
 enum wxPG_GETPROPERTYVALUES_FLAGS
 {
+/** Flag for wxPropertyGridInterface::SetProperty* functions,
+    wxPropertyGridInterface::HideProperty(), etc.
+    Apply changes only for the property in question.
+    @hideinitializer
+*/
+wxPG_DONT_RECURSE                 = 0x00000000,
 
-/** Flags for wxPropertyGridInterface::GetPropertyValues */
+/** Flag for wxPropertyGridInterface::GetPropertyValues().
+    Use this flag to retain category structure; each sub-category
+    will be its own wxVariantList of wxVariant.
+    @hideinitializer
+*/
 wxPG_KEEP_STRUCTURE               = 0x00000010,
 
-/** Flags for wxPropertyGrid::SetPropertyAttribute() etc */
+/** Flag for wxPropertyGridInterface::SetProperty* functions,
+    wxPropertyGridInterface::HideProperty(), etc.
+    Apply changes recursively for the property and all its children.
+    @hideinitializer
+*/
 wxPG_RECURSE                      = 0x00000020,
 
-/** Include attributes for GetPropertyValues. */
+/** Flag for wxPropertyGridInterface::GetPropertyValues().
+    Use this flag to include property attributes as well.
+    @hideinitializer
+*/
 wxPG_INC_ATTRIBUTES               = 0x00000040,
 
-/** Used when first starting recursion. */
+/** Used when first starting recursion.
+    @hideinitializer
+*/
 wxPG_RECURSE_STARTS               = 0x00000080,
 
-/** Force value change. */
+/** Force value change.
+    @hideinitializer
+*/
 wxPG_FORCE                        = 0x00000100,
 
 /** Only sort categories and their immediate children.
-    Sorting done by wxPG_AUTO_SORT option uses this.
+    Sorting done by ::wxPG_AUTO_SORT option uses this.
+    @hideinitializer
 */
 wxPG_SORT_TOP_LEVEL_ONLY          = 0x00000200
-
 };
 
-/** Flags for wxPropertyGrid::SetPropertyAttribute() etc */
-#define wxPG_DONT_RECURSE         0x00000000
-
 // -----------------------------------------------------------------------
 
-// Misc argument flags.
+/** Misc argument flags.
+*/
 enum wxPG_MISC_ARG_FLAGS
 {
-    // Get/Store full value instead of displayed value.
+    /** Get/Store full value instead of displayed value.
+        @hideinitializer
+    */
     wxPG_FULL_VALUE                     = 0x00000001,
 
+    /** Perform special action in case of unsuccessful conversion.
+        @hideinitializer
+    */
     wxPG_REPORT_ERROR                   = 0x00000002,
 
+    /**
+        @hideinitializer
+    */
     wxPG_PROPERTY_SPECIFIC              = 0x00000004,
 
-    // Get/Store editable value instead of displayed one (should only be
-    // different in the case of common values)
+    /** Get/Store editable value instead of displayed one (should only be
+        different in the case of common values).
+        @hideinitializer
+    */
     wxPG_EDITABLE_VALUE                 = 0x00000008,
 
-    // Used when dealing with fragments of composite string value
+    /** Used when dealing with fragments of composite string value
+        @hideinitializer
+    */
     wxPG_COMPOSITE_FRAGMENT             = 0x00000010,
 
-    // Means property for which final string value is for cannot really be
-    // edited.
+    /** Means property for which final string value is for cannot really be
+        edited.
+        @hideinitializer
+    */
     wxPG_UNEDITABLE_COMPOSITE_FRAGMENT  = 0x00000020,
 
-    // ValueToString() called from GetValueAsString()
-    // (guarantees that input wxVariant value is current own value)
+    /** wxPGProperty::ValueToString() called from wxPGProperty::GetValueAsString()
+        (guarantees that input wxVariant value is current own value)
+        @hideinitializer
+    */
     wxPG_VALUE_IS_CURRENT               = 0x00000040,
 
-    // Value is being set programmatically (ie. not by user)
+    /** Value is being set programmatically (i.e. not by user)
+        @hideinitializer
+    */
     wxPG_PROGRAMMATIC_VALUE             = 0x00000080
 };
 
 // -----------------------------------------------------------------------
 
-// wxPGProperty::SetValue() flags
+/** wxPGProperty::SetValue() flags
+*/
 enum wxPG_SETVALUE_FLAGS
 {
+    /**
+        @hideinitializer
+    */
     wxPG_SETVAL_REFRESH_EDITOR      = 0x0001,
+    /**
+        @hideinitializer
+    */
     wxPG_SETVAL_AGGREGATED          = 0x0002,
+    /**
+        @hideinitializer
+    */
     wxPG_SETVAL_FROM_PARENT         = 0x0004,
-    wxPG_SETVAL_BY_USER             = 0x0008  // Set if value changed by user
+    /** Set if value changed by user
+        @hideinitializer
+    */
+    wxPG_SETVAL_BY_USER             = 0x0008
 };
 
 // -----------------------------------------------------------------------
 
 //
-// Valid constants for wxPG_UINT_BASE attribute
-// (long because of wxVariant constructor)
-#define wxPG_BASE_OCT                       (long)8
-#define wxPG_BASE_DEC                       (long)10
-#define wxPG_BASE_HEX                       (long)16
-#define wxPG_BASE_HEXL                      (long)32
+/** Valid constants for ::wxPG_UINT_BASE attribute
+    (@c long because of wxVariant constructor)
+*/
+#define wxPG_BASE_OCT                       8L
+#define wxPG_BASE_DEC                       10L
+#define wxPG_BASE_HEX                       16L
+#define wxPG_BASE_HEXL                      32L
 
-//
-// Valid constants for wxPG_UINT_PREFIX attribute
-#define wxPG_PREFIX_NONE                    (long)0
-#define wxPG_PREFIX_0x                      (long)1
-#define wxPG_PREFIX_DOLLAR_SIGN             (long)2
+/** Valid constants for ::wxPG_UINT_PREFIX attribute
+*/
+#define wxPG_PREFIX_NONE                    0L
+#define wxPG_PREFIX_0x                      1L
+#define wxPG_PREFIX_DOLLAR_SIGN             2L
 
 // -----------------------------------------------------------------------
diff --git a/interface/wx/propgrid/propgridiface.h b/interface/wx/propgrid/propgridiface.h
index 9c3e916702..ea4c2eb4d6 100644
--- a/interface/wx/propgrid/propgridiface.h
+++ b/interface/wx/propgrid/propgridiface.h
@@ -411,7 +411,7 @@ public:
         Returns map-like storage of property's attributes.
 
         @remarks
-        Note that if extra style wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set,
+        Note that if extra style ::wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set,
         then builtin-attributes are not included in the storage.
     */
     const wxPGAttributeStorage& GetPropertyAttributes( wxPGPropArg id ) const;
@@ -691,7 +691,7 @@ public:
     /**
         Returns @true if property is selected.
     */
-    virtual bool IsPropertySelected( wxPGPropArg id ) const;
+    bool IsPropertySelected( wxPGPropArg id ) const;
 
     /**
         Returns @true if property is shown (i.e. HideProperty() with @true not
@@ -1053,7 +1053,19 @@ public:
     void SetPropertyImage( wxPGPropArg id, wxBitmap& bmp );
 
     /**
-        Sets max length of property's text.
+        Sets maximum length of text in property text editor.
+
+        @param id
+            Property name or pointer.
+        @param maxLen
+            Maximum number of characters of the text the user can enter in
+            the text editor. If it is 0, the length is not limited and the text
+            can be as long as it is supported by the the underlying native text
+            control widget.
+        @return
+            Returns @true if maximum length was set.
+        @see
+            wxPGProperty::SetMaxLength.
     */
     bool SetPropertyMaxLength( wxPGPropArg id, int maxLen );
 
diff --git a/interface/wx/propgrid/propgridpagestate.h b/interface/wx/propgrid/propgridpagestate.h
index 8289b59108..248e26f542 100644
--- a/interface/wx/propgrid/propgridpagestate.h
+++ b/interface/wx/propgrid/propgridpagestate.h
@@ -298,18 +298,14 @@ public:
     wxPropertyGridManager.
 
     @remarks
-    - In separate wxPropertyGrid component this class was known as
-    wxPropertyGridState.
-    - Currently this class is not implemented in wxPython.
+    Currently this class is not implemented in wxPython.
 
     @library{wxpropgrid}
     @category{propgrid}
 */
 class wxPropertyGridPageState
 {
-    friend class wxPGProperty;
     friend class wxPropertyGrid;
-    friend class wxPGCanvas;
     friend class wxPropertyGridInterface;
     friend class wxPropertyGridPage;
     friend class wxPropertyGridManager;
diff --git a/interface/wx/propgrid/props.h b/interface/wx/propgrid/props.h
index e4be903293..b36c29a8ad 100644
--- a/interface/wx/propgrid/props.h
+++ b/interface/wx/propgrid/props.h
@@ -35,7 +35,8 @@ public:
     Basic property with string value.
 
     <b>Supported special attributes:</b>
-    - "Password": set to 1 in order to enable wxTE_PASSWORD on the editor.
+    - ::wxPG_STRING_PASSWORD: set to @true in order to enable ::wxTE_PASSWORD
+    on the editor.
 
     @remarks
     - If value "<composed>" is set, then actual value is formed (or composed)
@@ -140,7 +141,7 @@ public:
 
 
     <b>Supported special attributes:</b>
-    - "Min", "Max": Specify acceptable value range.
+    - ::wxPG_ATTR_MIN, ::wxPG_ATTR_MAX: Specify acceptable value range.
 */
 class wxIntProperty : public wxPGProperty
 {
@@ -181,13 +182,13 @@ public:
     Seamlessly supports 64-bit integer (wxULongLong) on overflow.
 
     <b>Supported special attributes:</b>
-    - "Min", "Max": Specify acceptable value range.
-    - "Base": Define base. Valid constants are wxPG_BASE_OCT, wxPG_BASE_DEC,
-    wxPG_BASE_HEX and wxPG_BASE_HEXL (lowercase characters). Arbitrary bases
-    are <b>not</b> supported.
-    - "Prefix": Possible values are wxPG_PREFIX_NONE, wxPG_PREFIX_0x, and
-    wxPG_PREFIX_DOLLAR_SIGN. Only wxPG_PREFIX_NONE works with Decimal and Octal
-    numbers.
+    - ::wxPG_ATTR_MIN, ::wxPG_ATTR_MAX: Specify acceptable value range.
+    - ::wxPG_UINT_BASE: Define base. Valid constants are ::wxPG_BASE_OCT,
+    ::wxPG_BASE_DEC, ::wxPG_BASE_HEX and ::wxPG_BASE_HEXL (lowercase characters).
+    Arbitrary bases are <b>not</b> supported.
+    - ::wxPG_UINT_PREFIX: Possible values are ::wxPG_PREFIX_NONE, ::wxPG_PREFIX_0x,
+    and ::wxPG_PREFIX_DOLLAR_SIGN. Only ::wxPG_PREFIX_NONE works with Decimal
+    and Octal numbers.
 
     @remarks
     - For example how to use seamless 64-bit integer support, see wxIntProperty
@@ -226,8 +227,8 @@ protected:
     Basic property with double-precision floating point value.
 
     <b>Supported special attributes:</b>
-    - "Precision": Sets the (max) precision used when floating point value is
-    rendered as text. The default -1 means infinite precision.
+    - ::wxPG_FLOAT_PRECISION: Sets the (max) precision used when floating point
+    value is rendered as text. The default -1 means infinite precision.
 */
 class wxFloatProperty : public wxPGProperty
 {
@@ -242,7 +243,6 @@ public:
                                 const wxString& text,
                                 int argFlags = 0 ) const;
     virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-    virtual wxVariant DoGetAttribute( const wxString& name ) const;
     virtual bool ValidateValue( wxVariant& value,
                                 wxPGValidationInfo& validationInfo ) const;
 
@@ -267,8 +267,10 @@ protected:
     Basic property with boolean value.
 
     <b>Supported special attributes:</b>
-    - "UseCheckbox": Set to 1 to use check box editor instead of combo box.
-    - "UseDClickCycling": Set to 1 to cycle combo box instead showing the list.
+    - ::wxPG_BOOL_USE_CHECKBOX: Set to @true to use check box editor instead
+    of combo box.
+    - ::wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING: Set to @true to cycle combo box
+    instead showing the list.
 */
 class wxBoolProperty : public wxPGProperty
 {
@@ -508,14 +510,16 @@ public:
     Like wxLongStringProperty, but the button triggers file selector instead.
 
     <b>Supported special attributes:</b>
-    - "Wildcard": Sets wildcard (see wxFileDialog for format details), "All
-    files..." is default.
-    - "ShowFullPath": Default 1. When 0, only the file name is shown (i.e. drive
-      and directory are hidden).
-    - "ShowRelativePath": If set, then the filename is shown relative to the
-    given path string.
-    - "InitialPath": Sets the initial path of where to look for files.
-    - "DialogTitle": Sets a specific title for the dir dialog.
+    - ::wxPG_FILE_WILDCARD: Sets wildcard (see wxFileDialog for format details),
+    "All files..." is default.
+    - ::wxPG_FILE_SHOW_FULL_PATH: Default @true. When @false, only the file name is
+    shown (i.e. drive and directory are hidden).
+    - ::wxPG_FILE_SHOW_RELATIVE_PATH: If set, then the filename is shown relative
+    to the given path string.
+    - ::wxPG_FILE_INITIAL_PATH: Sets the initial path of where to look for files.
+    - ::wxPG_FILE_DIALOG_TITLE: Sets a specific title for the dir dialog.
+    - ::wxPG_FILE_DIALOG_STYLE: Sets a specific wxFileDialog style for the file
+    dialog (since 2.9.4).
 */
 class wxFileProperty : public wxPGProperty
 {
@@ -543,11 +547,14 @@ public:
     wxFileName GetFileName() const;
 
 protected:
+    bool DisplayEditorDialog(wxPropertyGrid* propGrid, wxString& value);
+
     wxString    m_wildcard;
-    wxString    m_basePath; // If set, then show path relative to it
-    wxString    m_initialPath; // If set, start the file dialog here
-    wxString    m_dlgTitle; // If set, used as title for file dialog
-    int         m_indFilter; // index to the selected filter
+    wxString    m_basePath;
+    wxString    m_initialPath;
+    wxString    m_dlgTitle;
+    int         m_indFilter;
+    long        m_dlgStyle;
 };
 
 
@@ -604,7 +611,7 @@ public:
     Like wxLongStringProperty, but the button triggers dir selector instead.
 
     <b>Supported special attributes:</b>
-    - "DialogMessage": Sets specific message in the dir selector.
+    - ::wxPG_DIR_DIALOG_MESSAGE: Sets specific message in the dir selector.
 */
 class wxDirProperty : public wxLongStringProperty
 {
diff --git a/interface/wx/ribbon/art.h b/interface/wx/ribbon/art.h
index 7cdb0b9156..167f440c3a 100644
--- a/interface/wx/ribbon/art.h
+++ b/interface/wx/ribbon/art.h
@@ -66,6 +66,10 @@ enum wxRibbonArtSetting
     wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR,
     wxRIBBON_ART_GALLERY_ITEM_BORDER_COLOUR,
     wxRIBBON_ART_TAB_LABEL_COLOUR,
+    /// @since 3.1.3
+    wxRIBBON_ART_TAB_ACTIVE_LABEL_COLOUR,
+    /// @since 3.1.3
+    wxRIBBON_ART_TAB_HOVER_LABEL_COLOUR,
     wxRIBBON_ART_TAB_SEPARATOR_COLOUR,
     wxRIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR,
     wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR,
diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h
index 177ce0545a..fc62e085b6 100644
--- a/interface/wx/scrolwin.h
+++ b/interface/wx/scrolwin.h
@@ -33,6 +33,9 @@ enum wxScrollbarVisibility
       so doesn't handle children specially. This is suitable e.g. for
       implementing scrollable controls such as tree or list controls.
 
+    @note
+    See wxScrolled::Create() if you want to use wxScrolled with a custom class.
+
     Starting from version 2.4 of wxWidgets, there are several ways to use a
     ::wxScrolledWindow (and now wxScrolled). In particular, there are
     three ways to set the size of the scrolling area:
@@ -231,8 +234,13 @@ public:
 
     /**
         Creates the window for two-step construction. Derived classes
-        should call or replace this function. See wxScrolled::wxScrolled()
-        for details.
+        should call or replace this function. If it is not replaced,
+        bear in mind that it calls T::Create() through the global function
+        wxCreateScrolled() so if T::Create() has a different signature
+        than wxScrolled::Create() you should implement overloaded
+        wxCreateScrolled() which would call T::Create() in the correct manner.
+
+        @see wxScrolled::wxScrolled() and wxCreateScrolled() for details.
     */
     bool Create(wxWindow* parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
@@ -590,6 +598,32 @@ protected:
     virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);
 };
 
+/**
+    Helper function which is called from wxScrolled::Create() to actually create
+    a scrolled window. By default it just passes the call to the base class Create():
+    @code
+    self->Create(parent, winid, pos, size, style, name);
+    @endcode
+
+    You should provide overloaded implementation of this function for the custom
+    base class if this class is created in a different manner, like it is e.g.
+    done for wxControl:
+    @code
+    bool wxCreateScrolled(wxControl* self,
+                          wxWindow *parent, wxWindowID winid,
+                          const wxPoint& pos, const wxSize& size,
+                          long style, const wxString& name)
+    {
+         return self->Create(parent, winid, pos, size, style, wxDefaultValidator, name);
+    }
+    @endcode
+
+    @since 3.1.3
+*/
+bool wxCreateScrolled(T* self,
+                      wxWindow *parent, wxWindowID winid,
+                      const wxPoint& pos, const wxSize& size,
+                      long style, const wxString& name);
 
 /**
     Scrolled window derived from wxPanel.
diff --git a/interface/wx/settings.h b/interface/wx/settings.h
index 925c6aa9c4..89c3d8049a 100644
--- a/interface/wx/settings.h
+++ b/interface/wx/settings.h
@@ -196,8 +196,10 @@ enum wxSystemMetric
     /**
         Time, in milliseconds, for how long a blinking caret should
         stay visible during a single blink cycle before it disappears.
-        If this value is negative, the platform does not support the
-        user setting.  Implemented only on GTK+ and MacOS X.
+
+        If this value is zero, caret should be visible all the time
+        instead of blinking.  If the value is negative, the platform
+        does not support the user setting.
 
         @since 3.1.1
     */
@@ -206,10 +208,10 @@ enum wxSystemMetric
     /**
         Time, in milliseconds, for how long a blinking caret should
         stay invisible during a single blink cycle before it reappears.
-        If this value is zero, carets should be visible all the time
+
+        If this value is zero, caret should be visible all the time
         instead of blinking.  If the value is negative, the platform
-        does not support the user setting.  Implemented only on GTK+
-        and MacOS X.
+        does not support the user setting.
 
         @since 3.1.1
     */
@@ -252,6 +254,55 @@ enum wxSystemScreenType
 };
 
 
+/**
+    Provides information about the current system appearance.
+
+    An object of this class can be retrieved using
+    wxSystemSettings::GetAppearance() and can then be queried for some aspects
+    of the current system appearance, notably whether the system is using a
+    dark theme, i.e. a theme with predominantly dark background.
+
+    This is useful for custom controls that don't use the standard system
+    colours, as they need to adjust the colours used for drawing them to fit in
+    the system look.
+
+    @since 3.1.3
+ */
+class wxSystemAppearance
+{
+public:
+    /**
+        Return the name if available or empty string otherwise.
+
+        This is currently only implemented for macOS 10.9 or later and returns
+        a not necessarily user-readable string such as "NSAppearanceNameAqua"
+        there and an empty string under all the other platforms.
+     */
+    wxString GetName() const;
+
+    /**
+        Return true if the current system there is explicitly recognized as
+        being a dark theme or if the default window background is dark.
+
+        This method should be used to check whether custom colours more
+        appropriate for the default (light) or dark appearance should be used.
+     */
+    bool IsDark() const;
+
+    /**
+        Return true if the default window background is significantly darker
+        than foreground.
+
+        This is used by IsDark() if there is no platform-specific way to
+        determine whether a dark mode is being used and is generally not very
+        useful to call directly.
+
+        @see wxColour::GetLuminance()
+     */
+    bool IsUsingDarkBackground() const;
+};
+
+
 /**
     @class wxSystemSettings
 
@@ -325,6 +376,13 @@ public:
     */
     static wxSystemScreenType GetScreenType();
 
+    /**
+        Returns the object describing the current system appearance.
+
+        @since 3.1.3
+     */
+    static wxSystemAppearance GetAppearance();
+
     /**
         Returns @true if the port has certain feature.
         See the ::wxSystemFeature enum values.
diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h
index c42fd3e380..90b2b5751d 100644
--- a/interface/wx/sizer.h
+++ b/interface/wx/sizer.h
@@ -1038,7 +1038,7 @@ public:
     */
     void SetNegativeButton(wxButton* button);
 
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
     virtual wxSize CalcMin();
 };
 
@@ -1713,7 +1713,7 @@ public:
     */
     const wxArrayInt& GetColWidths() const;
 
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
     virtual wxSize CalcMin();
 
 };
@@ -1840,7 +1840,7 @@ public:
     void SetVGap(int gap);
 
     virtual wxSize CalcMin();
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 };
 
 
@@ -1903,7 +1903,7 @@ public:
     wxStaticBox* GetStaticBox() const;
 
     virtual wxSize CalcMin();
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 };
 
 
@@ -1968,12 +1968,15 @@ public:
     void SetOrientation(int orient);
 
     /**
-        Implements the calculation of a box sizer's dimensions and then sets
-        the size of its children (calling wxWindow::SetSize if the child is a window).
+        Method which must be overridden in the derived sizer classes.
 
-        It is used internally only and must not be called by the user
-        (call Layout() if you want to resize). Documented for information.
+        The implementation should reposition the children using the current
+        total size available to the sizer (@c m_size) and the size computed by
+        the last call to CalcMin().
+
+        @since 3.1.3, before this version RecalcSizes() method not taking any
+            arguments had to be overridden in the derived classes instead.
     */
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 };
 
diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index 3c992fe511..f7ca8e70c6 100644
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -5360,6 +5360,8 @@ public:
 
     /**
         @member_group_name{Markers, Markers}
+
+        @see MarkerDefineBitmap
     */
     //@{
 
@@ -5437,8 +5439,10 @@ public:
 
     /**
         Define a marker from a bitmap
+
+        @since 3.1.3
     */
-    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+    void MarkerDefinePixmap(int markerNumber, const char* const* xpmData);
 
     /**
         Add a set of markers to a line.
@@ -5644,6 +5648,8 @@ public:
 
     /**
         @member_group_name{Autocompletion, Autocompletion}
+
+        @see RegisterImage(int, const wxBitmap&)
     */
     //@{
 
@@ -5756,8 +5762,10 @@ public:
 
     /**
         Register an image for use in autocompletion lists.
+
+        @since 3.1.3
     */
-    void RegisterImage(int type, const wxBitmap& bmp);
+    void RegisterImage(int type, const char* const* xpmData);
 
     /**
         Clear all the registered images.
@@ -7405,6 +7413,64 @@ public:
     */
     void AnnotationClearLine(int line);
 
+    /**
+       Define a marker with a wxBitmap.
+    */
+    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+
+    /**
+       Register an image for use in autocompletion lists.
+    */
+    void RegisterImage(int type, const wxBitmap& bmp);
+
+    /**
+       Set the colours used to display the items in an autocompletion list.
+
+       This method can be used if the default colours make the list hard to
+       read or if specific colours are desired for whatever reason.
+        @param background
+            The colour used for the background of the list.
+        @param text
+            The colour used for all text except for the selected item.
+        @param highlight
+            The colour used to highlight the selected item in the list.
+        @param highlightText
+            The colour used for the text of the selected item.
+        @remarks
+            To reset one or more of the colours to its default,
+            call this method with wxNullColour for the colour or colours
+            to be reset.
+
+        @since 3.1.3
+    */
+    void AutoCompSetColours(const wxColour& background, const wxColour& text,
+                            const wxColour& highlight,
+                            const wxColour& highlightText);
+                            
+    /**
+       Use a wxListCtrl to display autocompletion and user lists.
+
+       By default lists will be displayed in a wxListBox. Use this method to
+       display them in a wxListCtrl instead. The primary difference is that
+       wxListCtrl has hot tracking to highlight the item under the mouse cursor.
+        @param useListCtrl
+            Set this to true to use a wxListCtrl and to false to use a
+            wxListBox.
+        @param currentBgColour
+            The colour used to highlight the item under the mouse cursor.
+        @param currentTextColour
+            The colour used for the text of the item under the mouse cursor.
+        @remarks
+            To reset one or more of the colours to its default,
+            call this method with wxNullColour for the colour or colours
+            to be reset.
+
+        @since 3.1.3
+    */
+    void AutoCompUseListCtrl(bool useListCtrl = true,
+                             const wxColour& currentBgColour = wxNullColour,
+                             const wxColour& currentTextColour = wxNullColour);
+
     //@}
 
 
diff --git a/interface/wx/stdpaths.h b/interface/wx/stdpaths.h
index f7683b0cd0..cd92063cbd 100644
--- a/interface/wx/stdpaths.h
+++ b/interface/wx/stdpaths.h
@@ -389,8 +389,9 @@ public:
 
         If the value could not be determined the users home directory is returned.
 
-        @note On Unix this method respects the XDG base directory specification
-        only if SetFileLayout() with @c FileLayout_XDG had been called.
+        @note On Unix this (newer) method always respects the XDG base
+        directory specification, even if SetFileLayout() with @c FileLayout_XDG
+        hadn't been called.
 
         @since 3.1.0
     */
diff --git a/interface/wx/strconv.h b/interface/wx/strconv.h
index 00dfb359e6..7a2055495f 100644
--- a/interface/wx/strconv.h
+++ b/interface/wx/strconv.h
@@ -48,6 +48,26 @@ public:
     */
     virtual wxMBConv* Clone() const = 0;
 
+    /**
+        This function must be overridden in the derived classes to return the
+        maximum length, in bytes, of a single Unicode character representation
+        in this encoding.
+
+        As a consequence, the conversion object must be able to decode any
+        valid sequence of bytes in the corresponding encoding if it's at least
+        that many bytes long, but may fail if it is shorter. For example, for
+        UTF-8 the maximum character length is 4, as 3 bytes or less may be
+        insufficient to represent a Unicode character in UTF-8, but 4 are
+        always enough.
+
+        For compatibility reasons, this method is not pure virtual and returns
+        1 by default in the base class, however it should be always overridden
+        in the derived classes.
+
+        @since 3.1.3
+     */
+    virtual size_t GetMaxCharLen() const;
+
     /**
         This function returns 1 for most of the multibyte encodings in which the
         string is terminated by a single @c NUL, 2 for UTF-16 and 4 for UTF-32 for
diff --git a/interface/wx/systhemectrl.h b/interface/wx/systhemectrl.h
index 60a4405027..8d9a871e15 100644
--- a/interface/wx/systhemectrl.h
+++ b/interface/wx/systhemectrl.h
@@ -45,6 +45,27 @@
         };
    @endcode
 
+   Please also note that if you want to disable the system theme use in the
+   control that use it by default, it's best to do it before actually creating
+   the control as enabling the system theme can't always be completely undone
+   later. I.e. instead of
+   @code
+        // THIS CODE IS WRONG, DO NOT DO IT LIKE THIS
+        wxTreeCtrl* tree = new wxTreeCtrl(parent, wxID_ANY);
+        tree->EnableSystemTheme(false);
+   @endcode
+   prefer the following version:
+   @code
+        // Use default ctor to create the object, avoiding creating the window.
+        wxTreeCtrl* tree = new wxTreeCtrl();
+
+        // Then disable the system theme used by default.
+        tree->EnableSystemTheme(false);
+
+        // And only then actually create the window.
+        tree->Create(parent, wxID_ANY);
+   @endcode
+
    On non-MSW platforms this class currently does nothing but is still
    available, so that it can be used in portable code without any conditional
    compilation directives.
diff --git a/interface/wx/textcompleter.h b/interface/wx/textcompleter.h
index 8657b11f5d..5f792e24f8 100644
--- a/interface/wx/textcompleter.h
+++ b/interface/wx/textcompleter.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxTextCompleter
 // Author:      Vadim Zeitlin
 // Created:     2011-04-13
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/interface/wx/textentry.h b/interface/wx/textentry.h
index 7af88079be..c47f4a713b 100644
--- a/interface/wx/textentry.h
+++ b/interface/wx/textentry.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxTextEntry
 // Author:      Vadim Zeitlin
 // Created:     2009-03-01 (extracted from wx/textctrl.h)
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -533,7 +533,8 @@ public:
         would return @false immediately after the call to SetValue().
 
         The insertion point is set to the start of the control (i.e. position
-        0) by this function.
+        0) by this function unless the control value doesn't change at all, in
+        which case the insertion point is left at its original position.
 
         Note that, unlike most other functions changing the controls values,
         this function generates a @c wxEVT_TEXT event. To avoid
diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index 03d7ba16c4..42a0c4996e 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -333,10 +333,6 @@ public:
         @param label
             Text to be displayed near the control.
 
-        @remarks
-            wxMSW: the label is only displayed if there is enough space
-            available below the embedded control.
-
         @remarks
             wxMac: labels are only displayed if wxWidgets is built with @c
             wxMAC_USE_NATIVE_TOOLBAR set to 1
diff --git a/interface/wx/valnum.h b/interface/wx/valnum.h
index 0fb243b4f5..a2fa0290ee 100644
--- a/interface/wx/valnum.h
+++ b/interface/wx/valnum.h
@@ -89,6 +89,13 @@ public:
      */
     void SetMin(ValueType min);
 
+    /**
+        Gets the minimal value accepted by the validator.
+
+        @since 3.1.3
+     */
+    ValueType GetMin() const;
+
     /**
         Sets the maximal value accepted by the validator.
 
@@ -96,6 +103,13 @@ public:
      */
     void SetMax(ValueType max);
 
+    /**
+        Gets the maximum value accepted by the validator.
+
+        @since 3.1.3
+     */
+    ValueType GetMax() const;
+
     /**
         Sets both minimal and maximal values accepted by the validator.
 
@@ -103,6 +117,12 @@ public:
      */
     void SetRange(ValueType min, ValueType max);
 
+    /**
+        Gets both minimal and maximal values accepted by the validator.
+
+        @since 3.1.3
+     */
+    void GetRange(ValueType& min, ValueType& max) const;
 
     /**
         Change the validator style.
diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 0b441b3d0b..97a8432088 100644
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -546,7 +546,7 @@ public:
 
         @since 3.1.3
     */
-    bool MSWSetEmulationLevel(wxWebViewIE_EmulationLevel level = wxWEBVIEWIE_EMU_IE11);
+    static bool MSWSetEmulationLevel(wxWebViewIE_EmulationLevel level = wxWEBVIEWIE_EMU_IE11);
 
     /**
         @deprecated
@@ -562,7 +562,7 @@ public:
 
         @since 3.1.1
     */
-    bool MSWSetModernEmulationLevel(bool modernLevel = true);
+    static bool MSWSetModernEmulationLevel(bool modernLevel = true);
 
     /**
         Runs the given JavaScript code.
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 18f7b7b9af..ee69245147 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -3758,7 +3758,8 @@ public:
             or wxMOD_WIN specifying the modifier keys that have to be pressed along
             with the key.
         @param virtualKeyCode
-            The virtual key code of the hotkey.
+            The key code of the hotkey, e.g. an ASCII character such as @c 'K'
+            or one of elements of wxKeyCode enum.
 
         @return @true if the hotkey was registered successfully. @false if some
                  other application already registered a hotkey with this
diff --git a/interface/wx/wrapsizer.h b/interface/wx/wrapsizer.h
index 302da9643f..9f32ebe6eb 100644
--- a/interface/wx/wrapsizer.h
+++ b/interface/wx/wrapsizer.h
@@ -59,7 +59,7 @@ public:
     virtual bool InformFirstDirection(int direction, int size,
                                       int availableOtherDir);
 
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
     virtual wxSize CalcMin();
 
 protected:
diff --git a/locale/de.po b/locale/de.po
index 3a95696a26..367e954c06 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,21 +1,25 @@
+# German translations for wxWidgets
+# Copyright (C) 2019 wxWidgets
+# This file is distributed under the same license as the wxWidgets package.
 # Initial translation by unknown translator
 # Updated by Thomas Krebs <Thomas.Krebs@mecadtron.de>
 # Wolfgang Stöggl <c72578@yahoo.de>, 2014-2015.
+# Milo Ivir <mail@milotype.de>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets 3.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-05-21 14:25+0200\n"
-"PO-Revision-Date: 2015-10-21 19:34+0200\n"
-"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
+"PO-Revision-Date: 2019-03-16 21:37+0100\n"
+"Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: wxWidgets Team <wx-dev@wxwidgets.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.2.1\n"
 
 #: ../src/common/debugrpt.cpp:586
 msgid ""
@@ -49,11 +53,11 @@ msgstr " (Fehler %ld: %s)"
 #: ../src/common/imagtiff.cpp:72
 #, c-format
 msgid " (in module \"%s\")"
-msgstr " (im Modul »%s«)"
+msgstr " (im Modul „%s“)"
 
 #: ../src/osx/core/secretstore.cpp:138
 msgid " (while overwriting an existing item)"
-msgstr ""
+msgstr " (während ein Element überschrieben wird)"
 
 #: ../src/common/docview.cpp:1642
 msgid " - "
@@ -77,27 +81,27 @@ msgstr " dünn"
 
 #: ../src/common/fontcmn.cpp:807
 msgid " strikethrough"
-msgstr " durchstreichen"
+msgstr " durchgestrichen"
 
 #: ../src/common/paper.cpp:117
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
-msgstr "#10 Umschlag, 4 1/8 x 9 1/2 Zoll"
+msgstr "#10 Umschlag, 4 1/8 × 9 1/2 Zoll"
 
 #: ../src/common/paper.cpp:118
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
-msgstr "#11 Umschlag, 4 1/2 x 10 3/8 Zoll"
+msgstr "#11 Umschlag, 4 1/2 × 10 3/8 Zoll"
 
 #: ../src/common/paper.cpp:119
 msgid "#12 Envelope, 4 3/4 x 11 in"
-msgstr "#12 Umschlag, 4 3/4 x 11 Zoll"
+msgstr "#12 Umschlag, 4 3/4 × 11 Zoll"
 
 #: ../src/common/paper.cpp:120
 msgid "#14 Envelope, 5 x 11 1/2 in"
-msgstr "#14 Umschlag, 5 x 11 1/2 Zoll"
+msgstr "#14 Umschlag, 5 × 11 1/2 Zoll"
 
 #: ../src/common/paper.cpp:116
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
-msgstr "#9 Umschlag, 3 7/8 x 8 7/8 Zoll"
+msgstr "#9 Umschlag, 3 7/8 × 8 7/8 Zoll"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:341
 #: ../src/richtext/richtextsizepage.cpp:340
@@ -136,9 +140,9 @@ msgid "%lu of %lu"
 msgstr "%lu von %lu"
 
 #: ../src/generic/datavgen.cpp:6028
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d items)"
-msgstr "%s (oder %s)"
+msgstr "%s (%d Elemente)"
 
 #: ../src/common/cmdline.cpp:1221
 #, c-format
@@ -168,7 +172,7 @@ msgstr "%s Warnung"
 #: ../src/common/tarstrm.cpp:1319
 #, c-format
 msgid "%s did not fit the tar header for entry '%s'"
-msgstr "%s passte nicht zum tar Kopfeintrag für den Eintrag »%s«"
+msgstr "%s passte nicht zum tar Kopfeintrag für den Eintrag „%s“"
 
 #: ../src/common/fldlgcmn.cpp:124
 #, c-format
@@ -231,7 +235,7 @@ msgstr "&Hg Farbe:"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:298
 msgid "&Blur distance:"
-msgstr "&Weichzeichnungsentfernung"
+msgstr "Entfernung der &Weichzeichnung:"
 
 #: ../src/common/stockitem.cpp:143
 msgid "&Bold"
@@ -458,7 +462,7 @@ msgstr "&Springen zu"
 #: ../src/richtext/richtextindentspage.cpp:153
 #: ../src/richtext/richtextliststylepage.cpp:342
 msgid "&Justified"
-msgstr "&Ausgerichtet"
+msgstr "&Blocksatz"
 
 #: ../src/common/stockitem.cpp:174
 msgid "&Last"
@@ -504,8 +508,7 @@ msgstr "&Netzwerk"
 msgid "&New"
 msgstr "&Neu"
 
-#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:100
-#: ../src/msw/mdi.cpp:180
+#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:100 ../src/msw/mdi.cpp:180
 msgid "&Next"
 msgstr "&Weiter"
 
@@ -579,8 +582,7 @@ msgstr "&Positionierungs-Modus:"
 msgid "&Preferences"
 msgstr "&Einstellungen"
 
-#: ../src/aui/tabmdi.cpp:112 ../src/generic/mdig.cpp:101
-#: ../src/msw/mdi.cpp:181
+#: ../src/aui/tabmdi.cpp:112 ../src/generic/mdig.cpp:101 ../src/msw/mdi.cpp:181
 msgid "&Previous"
 msgstr "&Zurück"
 
@@ -621,7 +623,7 @@ msgstr "&Ersetzen"
 
 #: ../src/richtext/richtextstyledlg.cpp:287
 msgid "&Restart numbering"
-msgstr "&Nummerierung Neustart"
+msgstr "&Starte Nummerierung erneut"
 
 #: ../src/univ/themes/win32.cpp:3747
 msgid "&Restore"
@@ -698,7 +700,7 @@ msgstr "&Stile:"
 
 #: ../src/richtext/richtextsymboldlg.cpp:413
 msgid "&Subset:"
-msgstr "&Teilsatz"
+msgstr "&Teilsatz:"
 
 #: ../src/richtext/richtextliststylepage.cpp:268
 #: ../src/richtext/richtextbulletspage.cpp:209
@@ -747,7 +749,7 @@ msgstr "&Rückgängig "
 
 #: ../src/common/stockitem.cpp:204
 msgid "&Unindent"
-msgstr "&Einrücken"
+msgstr "&Einrückung entfernrn"
 
 #: ../src/common/stockitem.cpp:205
 msgid "&Up"
@@ -772,7 +774,7 @@ msgstr "&Dicke:"
 #: ../src/richtext/richtextsizepage.cpp:317
 #: ../src/richtext/richtextsizepage.cpp:324
 msgid "&Width:"
-msgstr "&Dicke:"
+msgstr "&Breite:"
 
 #: ../src/aui/tabmdi.cpp:311 ../src/aui/tabmdi.cpp:327
 #: ../src/aui/tabmdi.cpp:329 ../src/generic/mdig.cpp:294
@@ -788,67 +790,67 @@ msgstr "&Ja"
 #: ../src/common/valtext.cpp:256
 #, c-format
 msgid "'%s' contains illegal characters"
-msgstr "»%s« enthält ungültige Zeichen."
+msgstr "„%s“ enthält ungültige Zeichen"
 
 #: ../src/common/valtext.cpp:254
 #, c-format
 msgid "'%s' doesn't consist only of valid characters"
-msgstr "»%s« enthält nicht nur gültige Zeichen."
+msgstr "„%s“ enthält nicht nur gültige Zeichen"
 
 #: ../src/common/config.cpp:519 ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
-msgstr "»%s« hat extra '..', ignoriert."
+msgstr "„%s“ hat extra „..“, ignoriert."
 
 #: ../src/common/cmdline.cpp:1113 ../src/common/cmdline.cpp:1131
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
-msgstr "»%s« ist kein gültiger numerischer Wert für Option »%s«."
+msgstr "„%s“ ist kein gültiger numerischer Wert für Option „%s“."
 
 #: ../src/common/translation.cpp:1100
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "»%s« ist kein gültiger Nachrichtenkatalog."
+msgstr "„%s“ ist kein gültiger Nachrichtenkatalog."
 
 #: ../src/common/valtext.cpp:165
 #, c-format
 msgid "'%s' is not one of the valid strings"
-msgstr "»%s« ist keine gültige Zeichenkette."
+msgstr "„%s“ ist keine gültige Zeichenkette"
 
 #: ../src/common/valtext.cpp:167
 #, c-format
 msgid "'%s' is one of the invalid strings"
-msgstr "»%s« ist keine gültige Zeichenkette."
+msgstr "„%s“ ist eine ungültige Zeichenkette"
 
 #: ../src/common/textbuf.cpp:237
 #, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "»%s« ist vermutlich ein Binärpuffer."
+msgstr "„%s“ ist vermutlich ein Binärpuffer."
 
 #: ../src/common/valtext.cpp:252
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "»%s« sollte numerisch sein."
+msgstr "„%s“ sollte numerisch sein."
 
 #: ../src/common/valtext.cpp:244
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "»%s« sollte ausschließlich ASCII-Zeichen enthalten."
+msgstr "„%s“ sollte ausschließlich ASCII-Zeichen enthalten."
 
 #: ../src/common/valtext.cpp:246
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "»%s« sollte nur alphabetische Zeichen enthalten."
+msgstr "„%s“ sollte nur alphabetische Zeichen enthalten."
 
 #: ../src/common/valtext.cpp:248
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "»%s« sollte nur alphanumerische Zeichen enthalten."
+msgstr "„%s“ sollte nur alphanumerische Zeichen enthalten."
 
 #: ../src/common/valtext.cpp:250
 #, c-format
 msgid "'%s' should only contain digits."
-msgstr "»%s« sollte ausschließlich Ziffern enthalten."
+msgstr "„%s“ sollte ausschließlich Ziffern enthalten."
 
 #: ../src/richtext/richtextliststylepage.cpp:229
 #: ../src/richtext/richtextbulletspage.cpp:166
@@ -963,23 +965,23 @@ msgstr "1.9"
 
 #: ../src/common/paper.cpp:140
 msgid "10 x 11 in"
-msgstr "10 x 11 Zoll"
+msgstr "10 × 11 Zoll"
 
 #: ../src/common/paper.cpp:113
 msgid "10 x 14 in"
-msgstr "10 x 14 Zoll"
+msgstr "10 × 14 Zoll"
 
 #: ../src/common/paper.cpp:114
 msgid "11 x 17 in"
-msgstr "11 x 17 Zoll"
+msgstr "11 × 17 Zoll"
 
 #: ../src/common/paper.cpp:184
 msgid "12 x 11 in"
-msgstr "12 x 11 Zoll"
+msgstr "12 × 11 Zoll"
 
 #: ../src/common/paper.cpp:141
 msgid "15 x 11 in"
-msgstr "15 x 11 Zoll"
+msgstr "15 × 11 Zoll"
 
 #: ../src/richtext/richtextindentspage.cpp:285
 #: ../src/richtext/richtextliststylepage.cpp:459
@@ -988,11 +990,11 @@ msgstr "2"
 
 #: ../src/common/paper.cpp:132
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
-msgstr "6 3/4 Umschlag, 3 5/8 x 6 1/2 Zoll"
+msgstr "6 3/4 Umschlag, 3 5/8 × 6 1/2 Zoll"
 
 #: ../src/common/paper.cpp:139
 msgid "9 x 11 in"
-msgstr "9 x 11 Zoll"
+msgstr "9 × 11 Zoll"
 
 #: ../src/html/htmprint.cpp:431
 msgid ": file does not exist!"
@@ -1013,32 +1015,32 @@ msgstr "< &Zurück"
 #: ../src/osx/carbon/fontdlg.cpp:422 ../src/osx/carbon/fontdlg.cpp:628
 #: ../src/osx/carbon/fontdlg.cpp:648
 msgid "<Any Decorative>"
-msgstr "<Beliebig Dekorativ>"
+msgstr "<Beliebige Dekorative>"
 
 #: ../src/osx/carbon/fontdlg.cpp:423 ../src/osx/carbon/fontdlg.cpp:630
 #: ../src/osx/carbon/fontdlg.cpp:650
 msgid "<Any Modern>"
-msgstr "<Beliebig Modern>"
+msgstr "<Beliebige Moderne>"
 
 #: ../src/osx/carbon/fontdlg.cpp:421 ../src/osx/carbon/fontdlg.cpp:626
 #: ../src/osx/carbon/fontdlg.cpp:646
 msgid "<Any Roman>"
-msgstr "<Beliebig Roman>"
+msgstr "<Beliebige Serifenschrift>"
 
 #: ../src/osx/carbon/fontdlg.cpp:424 ../src/osx/carbon/fontdlg.cpp:632
 #: ../src/osx/carbon/fontdlg.cpp:652
 msgid "<Any Script>"
-msgstr "<Beliebig Script>"
+msgstr "<Beliebige Schreibschrift>"
 
 #: ../src/osx/carbon/fontdlg.cpp:425 ../src/osx/carbon/fontdlg.cpp:637
 #: ../src/osx/carbon/fontdlg.cpp:656
 msgid "<Any Swiss>"
-msgstr "<Beliebig Swiss>"
+msgstr "<Beliebige Serifenlose>"
 
 #: ../src/osx/carbon/fontdlg.cpp:426 ../src/osx/carbon/fontdlg.cpp:634
 #: ../src/osx/carbon/fontdlg.cpp:654
 msgid "<Any Teletype>"
-msgstr "<Beliebig Schreibmaschine>"
+msgstr "<Beliebige Schreibmaschinen-Schrift>"
 
 #: ../src/osx/carbon/fontdlg.cpp:420
 msgid "<Any>"
@@ -1087,7 +1089,7 @@ msgstr "Ein Fehlerbericht wurde erstellt. Er liegt im Verzeichnis"
 
 #: ../src/common/xtixml.cpp:418
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr "Eine nicht leere Sammlung muss aus »element«-Knoten bestehen"
+msgstr "Eine nicht leere Sammlung muss aus „element“-Knoten bestehen"
 
 #: ../src/richtext/richtextliststylepage.cpp:304
 #: ../src/richtext/richtextliststylepage.cpp:306
@@ -1098,83 +1100,83 @@ msgstr "Ein vordefinierter Gliederungspunkt."
 
 #: ../src/common/paper.cpp:217
 msgid "A0 sheet, 841 x 1189 mm"
-msgstr "A0 Blatt, 841 x 1189 mm"
+msgstr "A0 Blatt, 841 × 1189 mm"
 
 #: ../src/common/paper.cpp:218
 msgid "A1 sheet, 594 x 841 mm"
-msgstr "A1 Blatt, 594 x 841 mm"
+msgstr "A1 Blatt, 594 × 841 mm"
 
 #: ../src/common/paper.cpp:159
 msgid "A2 420 x 594 mm"
-msgstr "A2 420 x 594 mm"
+msgstr "A2 420 × 594 mm"
 
 #: ../src/common/paper.cpp:156
 msgid "A3 Extra 322 x 445 mm"
-msgstr "A3 Extra 322 x 445 mm"
+msgstr "A3 Extra 322 × 445 mm"
 
 #: ../src/common/paper.cpp:161
 msgid "A3 Extra Transverse 322 x 445 mm"
-msgstr "A3 Extra Quer 322 x 445 mm"
+msgstr "A3 Extra Quer 322 × 445 mm"
 
 #: ../src/common/paper.cpp:170
 msgid "A3 Rotated 420 x 297 mm"
-msgstr "A3 Rotiert 420 x 297 mm"
+msgstr "A3 Rotiert 420 × 297 mm"
 
 #: ../src/common/paper.cpp:160
 msgid "A3 Transverse 297 x 420 mm"
-msgstr "A3 Quer 297 x 420 mm"
+msgstr "A3 Quer 297 × 420 mm"
 
 #: ../src/common/paper.cpp:106
 msgid "A3 sheet, 297 x 420 mm"
-msgstr "A3 Blatt, 297 x 420 mm"
+msgstr "A3 Blatt, 297 × 420 mm"
 
 #: ../src/common/paper.cpp:146
 msgid "A4 Extra 9.27 x 12.69 in"
-msgstr "A4 Extra 9.27 x 12.69 Zoll"
+msgstr "A4 Extra 9.27 × 12.69 Zoll"
 
 #: ../src/common/paper.cpp:153
 msgid "A4 Plus 210 x 330 mm"
-msgstr "A4 Plus 210 x 330 mm"
+msgstr "A4 Plus 210 × 330 mm"
 
 #: ../src/common/paper.cpp:171
 msgid "A4 Rotated 297 x 210 mm"
-msgstr "A4 Rotiert 297 x 210 mm"
+msgstr "A4 Rotiert 297 × 210 mm"
 
 #: ../src/common/paper.cpp:148
 msgid "A4 Transverse 210 x 297 mm"
-msgstr "A4 Quer 210 x 297 mm"
+msgstr "A4 Quer 210 × 297 mm"
 
 #: ../src/common/paper.cpp:97
 msgid "A4 sheet, 210 x 297 mm"
-msgstr "A4 Blatt, 210 x 297 mm"
+msgstr "A4 Blatt, 210 × 297 mm"
 
 #: ../src/common/paper.cpp:107
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4 klein Blatt, 210 x 297 mm"
+msgstr "A4 klein Blatt, 210 × 297 mm"
 
 #: ../src/common/paper.cpp:157
 msgid "A5 Extra 174 x 235 mm"
-msgstr "A5 Extra 174 x 235 mm"
+msgstr "A5 Extra 174 × 235 mm"
 
 #: ../src/common/paper.cpp:172
 msgid "A5 Rotated 210 x 148 mm"
-msgstr "A5 Rotiert 210 x 148 mm"
+msgstr "A5 Rotiert 210 × 148 mm"
 
 #: ../src/common/paper.cpp:154
 msgid "A5 Transverse 148 x 210 mm"
-msgstr "A5 Quer 148 x 210 mm"
+msgstr "A5 Quer 148 × 210 mm"
 
 #: ../src/common/paper.cpp:108
 msgid "A5 sheet, 148 x 210 mm"
-msgstr "A4 Blatt, 148 x 210 mm"
+msgstr "A4 Blatt, 148 × 210 mm"
 
 #: ../src/common/paper.cpp:164
 msgid "A6 105 x 148 mm"
-msgstr "A6 105 x 148 mm"
+msgstr "A6 105 × 148 mm"
 
 #: ../src/common/paper.cpp:177
 msgid "A6 Rotated 148 x 105 mm"
-msgstr "A6 Rotiert 148 x 105 mm"
+msgstr "A6 Rotiert 148 × 105 mm"
 
 #: ../src/generic/fontdlgg.cpp:83 ../src/richtext/richtextformatdlg.cpp:529
 #: ../src/osx/carbon/fontdlg.cpp:153
@@ -1234,7 +1236,7 @@ msgstr "Zeile hinzufügen"
 
 #: ../src/html/helpwnd.cpp:432
 msgid "Add current page to bookmarks"
-msgstr "Aktuelle HTML-Seite den Lesezeichen hinzufügen"
+msgstr "Aktuelle Seite zu Lesezeichen hinzufügen"
 
 #: ../src/generic/colrdlgg.cpp:366
 msgid "Add to custom colours"
@@ -1333,7 +1335,7 @@ msgstr "AppWorkspace"
 #: ../src/generic/logg.cpp:1014
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "An Logdatei »%s« anhängen ([Nein] wird sie ersetzen)?"
+msgstr "An Logdatei „%s“ anhängen ([Nein] wird sie ersetzen)?"
 
 #: ../src/osx/menu_osx.cpp:577 ../src/osx/menu_osx.cpp:585
 msgid "Application"
@@ -1386,51 +1388,51 @@ msgstr "Verfügbare Schriftarten."
 
 #: ../src/common/paper.cpp:137
 msgid "B4 (ISO) 250 x 353 mm"
-msgstr "B4 (ISO) 250 x 353 mm"
+msgstr "B4 (ISO) 250 × 353 mm"
 
 #: ../src/common/paper.cpp:173
 msgid "B4 (JIS) Rotated 364 x 257 mm"
-msgstr "B4 (JIS) Rotiert 364 x 257 mm"
+msgstr "B4 (JIS) Rotiert 364 × 257 mm"
 
 #: ../src/common/paper.cpp:127
 msgid "B4 Envelope, 250 x 353 mm"
-msgstr "B4 Umschlag, 250 x 353 mm"
+msgstr "B4 Umschlag, 250 × 353 mm"
 
 #: ../src/common/paper.cpp:109
 msgid "B4 sheet, 250 x 354 mm"
-msgstr "B4 Blatt, 250 x 354 mm"
+msgstr "B4 Blatt, 250 × 354 mm"
 
 #: ../src/common/paper.cpp:158
 msgid "B5 (ISO) Extra 201 x 276 mm"
-msgstr "B5 (ISO) Extra 201 x 276 mm"
+msgstr "B5 (ISO) Extra 201 × 276 mm"
 
 #: ../src/common/paper.cpp:174
 msgid "B5 (JIS) Rotated 257 x 182 mm"
-msgstr "B5 (JIS) Rotiert 257 x 182 mm"
+msgstr "B5 (JIS) Rotiert 257 × 182 mm"
 
 #: ../src/common/paper.cpp:155
 msgid "B5 (JIS) Transverse 182 x 257 mm"
-msgstr "B5 (JIS) Quer 182 x 257 mm"
+msgstr "B5 (JIS) Quer 182 × 257 mm"
 
 #: ../src/common/paper.cpp:128
 msgid "B5 Envelope, 176 x 250 mm"
-msgstr "B5 Umschlag, 176 x 250 mm"
+msgstr "B5 Umschlag, 176 × 250 mm"
 
 #: ../src/common/paper.cpp:110
 msgid "B5 sheet, 182 x 257 millimeter"
-msgstr "B5 Blatt, 182 x 257 mm"
+msgstr "B5 Blatt, 182 × 257 mm"
 
 #: ../src/common/paper.cpp:182
 msgid "B6 (JIS) 128 x 182 mm"
-msgstr "B6 (JIS) 128 x 182 mm"
+msgstr "B6 (JIS) 128 × 182 mm"
 
 #: ../src/common/paper.cpp:183
 msgid "B6 (JIS) Rotated 182 x 128 mm"
-msgstr "B6 (JIS) Rotiert 182 x 128 mm"
+msgstr "B6 (JIS) Rotiert 182 × 128 mm"
 
 #: ../src/common/paper.cpp:129
 msgid "B6 Envelope, 176 x 125 mm"
-msgstr "B6 Umschlag, 176 x 125 mm"
+msgstr "B6 Umschlag, 176 × 125 mm"
 
 #: ../src/common/imagbmp.cpp:531 ../src/common/imagbmp.cpp:561
 #: ../src/common/imagbmp.cpp:576
@@ -1515,9 +1517,8 @@ msgid "Blue"
 msgstr "Blau"
 
 #: ../src/generic/colrdlgg.cpp:345
-#, fuzzy
 msgid "Blue:"
-msgstr "Blau"
+msgstr "Blau:"
 
 #: ../src/generic/fontdlgg.cpp:333 ../src/richtext/richtextfontpage.cpp:355
 #: ../src/osx/carbon/fontdlg.cpp:354 ../src/common/stockitem.cpp:143
@@ -1602,7 +1603,7 @@ msgstr "ButtonText"
 
 #: ../src/common/paper.cpp:98
 msgid "C sheet, 17 x 22 in"
-msgstr "C Blatt, 17 x 22 Zoll"
+msgstr "C Blatt, 17 × 22 Zoll"
 
 #: ../src/generic/logg.cpp:514
 msgid "C&lear"
@@ -1614,23 +1615,23 @@ msgstr "&Farbe:"
 
 #: ../src/common/paper.cpp:123
 msgid "C3 Envelope, 324 x 458 mm"
-msgstr "C3 Umschlag, 324 x 458 mm"
+msgstr "C3 Umschlag, 324 × 458 mm"
 
 #: ../src/common/paper.cpp:124
 msgid "C4 Envelope, 229 x 324 mm"
-msgstr "C4 Umschlag, 229 x 324 mm"
+msgstr "C4 Umschlag, 229 × 324 mm"
 
 #: ../src/common/paper.cpp:122
 msgid "C5 Envelope, 162 x 229 mm"
-msgstr "C5 Umschlag, 162 x 229 mm"
+msgstr "C5 Umschlag, 162 × 229 mm"
 
 #: ../src/common/paper.cpp:125
 msgid "C6 Envelope, 114 x 162 mm"
-msgstr "C6 Umschlag, 114 x 162 mm"
+msgstr "C6 Umschlag, 114 × 162 mm"
 
 #: ../src/common/paper.cpp:126
 msgid "C65 Envelope, 114 x 229 mm"
-msgstr "C65 Umschlag, 114 x 229 mm"
+msgstr "C65 Umschlag, 114 × 229 mm"
 
 #: ../src/common/stockitem.cpp:146
 msgid "CD-Rom"
@@ -1638,7 +1639,7 @@ msgstr "CD-ROM"
 
 #: ../src/html/chm.cpp:815 ../src/html/chm.cpp:874
 msgid "CHM handler currently supports only local files!"
-msgstr "CHM-Handler unterstützt derzeit nur lokale Dateien."
+msgstr "CHM-Handler unterstützt derzeit nur lokale Dateien!"
 
 #: ../src/richtext/richtextfontpage.cpp:282
 msgid "Ca&pitals"
@@ -1657,7 +1658,7 @@ msgstr ""
 #: ../src/msw/registry.cpp:506
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "Kann Registrierungsschlüssel »%s« nicht schließen."
+msgstr "Kann Registrierungsschlüssel „%s“ nicht schließen."
 
 #: ../src/msw/registry.cpp:584
 #, c-format
@@ -1667,7 +1668,7 @@ msgstr "Kann Inhalte des nicht unterstützten Typs %d nicht kopieren."
 #: ../src/msw/registry.cpp:487
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "Kann Registrierungsschlüssel »%s« nicht anlegen."
+msgstr "Kann Registrierungsschlüssel „%s“ nicht erzeugen."
 
 #: ../src/msw/thread.cpp:665
 msgid "Can't create thread"
@@ -1676,32 +1677,32 @@ msgstr "Kann Thread nicht erzeugen"
 #: ../src/msw/window.cpp:3691
 #, c-format
 msgid "Can't create window of class %s"
-msgstr "Kann kein Fenster der Klasse »%s« anlegen."
+msgstr "Kann kein Fenster der Klasse „%s“ anlegen"
 
 #: ../src/msw/registry.cpp:777
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "Kann Schlüssel »%s« nicht löschen"
+msgstr "Kann Schlüssel „%s“ nicht löschen"
 
 #: ../src/msw/iniconf.cpp:458
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "Kann INI-Datei »%s« nicht löschen"
+msgstr "Kann INI-Datei „%s“ nicht löschen"
 
 #: ../src/msw/registry.cpp:805
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "Kann Wert »%s« von Schlüssel »%s« nicht löschen."
+msgstr "Kann Wert „%s“ von Schlüssel „%s“ nicht löschen."
 
 #: ../src/msw/registry.cpp:1171
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "Kann Unterschlüssel von »%s« nicht auflisten"
+msgstr "Kann Unterschlüssel von „%s“ nicht auflisten"
 
 #: ../src/msw/registry.cpp:1132
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "Kann Werte von Schlüssel »%s« nicht auflisten"
+msgstr "Kann Werte von Schlüssel „%s“ nicht auflisten"
 
 #: ../src/msw/registry.cpp:1389
 #, c-format
@@ -1711,32 +1712,32 @@ msgstr "Kann Wert des nicht unterstützten Typs %d nicht kopieren."
 #: ../src/common/ffile.cpp:254
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "Kann aktuelle Position in Datei »%s« nicht finden."
+msgstr "Kann aktuelle Position in Datei „%s“ nicht finden."
 
 #: ../src/msw/registry.cpp:418
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "Kann keine Information über den Registrierungsschlüssel »%s« finden"
+msgstr "Kann keine Information über den Registrierungsschlüssel „%s“ finden"
 
 #: ../src/common/zstream.cpp:346
 msgid "Can't initialize zlib deflate stream."
-msgstr "Kann das Entpacken der zlib-Daten nicht initialisieren"
+msgstr "Kann das Entpacken der zlib-Daten nicht initialisieren."
 
 #: ../src/common/zstream.cpp:185
 msgid "Can't initialize zlib inflate stream."
-msgstr "Kann das Komprimieren der zlib-Daten nicht initialisieren"
+msgstr "Kann das Komprimieren der zlib-Daten nicht initialisieren."
 
 #: ../src/msw/fswatcher.cpp:476
 #, c-format
 msgid "Can't monitor non-existent directory \"%s\" for changes."
 msgstr ""
-"Das nicht vorhandene Verzeichnis »%s« kann nicht auf Änderungen überwacht "
+"Das nicht vorhandene Verzeichnis „%s“ kann nicht auf Änderungen überwacht "
 "werden."
 
 #: ../src/msw/registry.cpp:454
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "Kann Registrierungsschlüssel »%s« nicht öffnen"
+msgstr "Kann Registrierungsschlüssel „%s“ nicht öffnen"
 
 #: ../src/common/zstream.cpp:252
 #, c-format
@@ -1752,18 +1753,18 @@ msgstr ""
 #: ../src/msw/registry.cpp:1064
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "Kann Wert von »%s« nicht lesen"
+msgstr "Kann Wert von „%s“ nicht lesen"
 
 #: ../src/msw/registry.cpp:878 ../src/msw/registry.cpp:910
 #: ../src/msw/registry.cpp:975
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "Kann Wert von Eintrag »%s« nicht lesen"
+msgstr "Kann Wert von Eintrag „%s“ nicht lesen"
 
 #: ../src/common/image.cpp:2620
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "Kann Bild nicht aus Datei »%s« laden: Unbekannte Dateiendung."
+msgstr "Kann Bild nicht aus Datei „%s“ laden: Unbekannte Dateiendung."
 
 #: ../src/generic/logg.cpp:573 ../src/generic/logg.cpp:976
 msgid "Can't save log contents to file."
@@ -1777,7 +1778,7 @@ msgstr "Kann Thread-Priorität nicht setzen"
 #: ../src/msw/registry.cpp:1081
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "Kann Wert von »%s« nicht setzen"
+msgstr "Kann Wert von „%s“ nicht setzen"
 
 #: ../src/unix/utilsunx.cpp:351
 msgid "Can't write to child process's stdin"
@@ -1799,12 +1800,12 @@ msgstr "Abbrechen"
 #: ../src/common/filefn.cpp:1261
 #, c-format
 msgid "Cannot enumerate files '%s'"
-msgstr "Kann Dateien »%s« nicht auflisten"
+msgstr "Kann Dateien „%s“ nicht auflisten"
 
 #: ../src/msw/dir.cpp:263
 #, c-format
 msgid "Cannot enumerate files in directory '%s'"
-msgstr "Kann Dateien in Verzeichnis »%s« nicht auflisten"
+msgstr "Kann Dateien in Verzeichnis „%s“ nicht auflisten"
 
 #: ../src/msw/dialup.cpp:523
 #, c-format
@@ -1818,7 +1819,7 @@ msgstr "Kann Adressbuchdatei nicht finden"
 #: ../src/msw/ole/automtn.cpp:562
 #, c-format
 msgid "Cannot get an active instance of \"%s\""
-msgstr "Kann kein aktives Exemplar von »%s« bekommen"
+msgstr "Kann kein aktives Exemplar von „%s“ bekommen"
 
 #: ../src/unix/threadpsx.cpp:1035
 #, c-format
@@ -1848,17 +1849,17 @@ msgstr "Kann Sockets nicht initialisieren"
 #: ../src/msw/volume.cpp:619
 #, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "Kann das Icon nicht von »%s« laden."
+msgstr "Kann das Icon nicht von „%s“ laden."
 
 #: ../src/xrc/xmlres.cpp:360
 #, c-format
 msgid "Cannot load resources from '%s'."
-msgstr "Kann die Ressourcen nicht aus »%s« laden."
+msgstr "Kann die Ressourcen nicht aus „%s“ laden."
 
 #: ../src/xrc/xmlres.cpp:742
 #, c-format
 msgid "Cannot load resources from file '%s'."
-msgstr "Kann die Ressourcen nicht aus der Datei »%s« laden."
+msgstr "Kann die Ressourcen nicht aus der Datei „%s“ laden."
 
 #: ../src/html/htmlfilt.cpp:137
 #, c-format
@@ -1873,7 +1874,7 @@ msgstr "HTML-Hilfebuch %s kann nicht geöffnet werden"
 #: ../src/html/helpdata.cpp:299
 #, c-format
 msgid "Cannot open contents file: %s"
-msgstr "Kann den Inhalt der Datei %s nicht öffnen!"
+msgstr "Kann den Inhalt der Datei %s nicht öffnen"
 
 #: ../src/generic/dcpsg.cpp:1667
 msgid "Cannot open file for PostScript printing!"
@@ -1882,12 +1883,12 @@ msgstr "Kann Datei für den Postscriptdruck nicht öffnen!"
 #: ../src/html/helpdata.cpp:313
 #, c-format
 msgid "Cannot open index file: %s"
-msgstr "Kann Indexdatei %s nicht öffnen!"
+msgstr "Kann Indexdatei %s nicht öffnen"
 
 #: ../src/xrc/xmlres.cpp:724
 #, c-format
 msgid "Cannot open resources file '%s'."
-msgstr "Kann die Ressourcendatei »%s« nicht öffnen."
+msgstr "Kann die Ressourcendatei „%s“ nicht öffnen."
 
 #: ../src/html/helpwnd.cpp:1534
 msgid "Cannot print empty page."
@@ -1896,7 +1897,7 @@ msgstr "Leere Seite kann nicht gedruckt werden."
 #: ../src/msw/volume.cpp:507
 #, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "Kann die Typnamen nicht aus »%s« lesen!"
+msgstr "Kann die Typnamen nicht aus „%s“ lesen!"
 
 #: ../src/msw/thread.cpp:888
 #, c-format
@@ -1905,12 +1906,12 @@ msgstr "Kann Thread %lx nicht fortsetzen"
 
 #: ../src/unix/threadpsx.cpp:1016
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "Kann Scheduling-Verfahren der Threads nicht ermitteln"
+msgstr "Kann Scheduling-Verfahren der Threads nicht ermitteln."
 
 #: ../src/common/intl.cpp:558
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
-msgstr "Lokalisierung kann nicht auf die Sprache »%s« gesetzt werden."
+msgstr "Lokalisierung kann nicht auf die Sprache „%s“ gesetzt werden."
 
 #: ../src/unix/threadpsx.cpp:831 ../src/msw/thread.cpp:546
 msgid "Cannot start thread: error writing TLS."
@@ -1919,7 +1920,7 @@ msgstr "Kann Thread nicht starten: Fehler beim Beschreiben des TLS."
 #: ../src/msw/thread.cpp:872
 #, c-format
 msgid "Cannot suspend thread %lx"
-msgstr "Kann Thread %lx nicht anhalten."
+msgstr "Kann Thread %lx nicht anhalten"
 
 #: ../src/msw/thread.cpp:794
 msgid "Cannot wait for thread termination"
@@ -1968,14 +1969,14 @@ msgstr "Zentraleuropäisch (ISO-8859-2)"
 #: ../src/richtext/richtextliststylepage.cpp:250
 #: ../src/richtext/richtextbulletspage.cpp:187
 msgid "Centre"
-msgstr "Zentriert"
+msgstr "Zentriere"
 
 #: ../src/richtext/richtextindentspage.cpp:162
 #: ../src/richtext/richtextindentspage.cpp:164
 #: ../src/richtext/richtextliststylepage.cpp:351
 #: ../src/richtext/richtextliststylepage.cpp:353
 msgid "Centre text."
-msgstr "Zentriere Text."
+msgstr "Zentriere den Text."
 
 #: ../src/richtext/richtextsizepage.cpp:287
 msgid "Centred"
@@ -2008,12 +2009,12 @@ msgstr "Stil ändern"
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 "Änderungen werden nicht gesichert um das Überschreiben der vorhandenen Datei "
-"»%s« zu vermeiden."
+"„%s“ zu vermeiden."
 
 #: ../src/gtk/filepicker.cpp:190 ../src/gtk/filedlg.cpp:87
 #, c-format
 msgid "Changing current directory to \"%s\" failed"
-msgstr "Wechseln des aktuellen Ordners auf »%s« fehlgeschlagen"
+msgstr "Wechseln des aktuellen Ordners auf „%s“ fehlgeschlagen"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1757
@@ -2072,7 +2073,7 @@ msgstr "Klicken um die Schriftart auf unterstrichen zu stellen."
 #: ../src/richtext/richtextstyledlg.cpp:289
 #: ../src/richtext/richtextstyledlg.cpp:291
 msgid "Check to restart numbering."
-msgstr "Klicken um die Nummerierung neu zu starten"
+msgstr "Klicken um die Nummerierung neu zu starten."
 
 #: ../src/richtext/richtextfontpage.cpp:277
 #: ../src/richtext/richtextfontpage.cpp:279
@@ -2128,7 +2129,7 @@ msgstr "Schriftart wählen"
 #: ../src/common/module.cpp:74
 #, c-format
 msgid "Circular dependency involving module \"%s\" detected."
-msgstr "Zirkuläre Abhängigkeit betreffend das Modul »%s« erkannt."
+msgstr "Zirkuläre Abhängigkeit betreffend das Modul „%s“ erkannt."
 
 #: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:97
 msgid "Cl&ose"
@@ -2273,7 +2274,7 @@ msgstr "Fenster schließen"
 #. TRANSLATORS: Action for manipulating a tree control
 #: ../src/generic/datavgen.cpp:6006
 msgid "Collapse"
-msgstr ""
+msgstr "Zusammenklappen"
 
 #: ../src/common/stockitem.cpp:193
 msgid "Color"
@@ -2293,9 +2294,9 @@ msgid "Colour:"
 msgstr "Farbe:"
 
 #: ../src/generic/datavgen.cpp:6077
-#, fuzzy, c-format
+#, c-format
 msgid "Column %u"
-msgstr "Spalte hinzufügen"
+msgstr "Spalte %u"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:114
@@ -2336,7 +2337,7 @@ msgstr "Computer"
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr ""
-"Die Bezeichnung des Konfigurations-Eintrags kann nicht mit »%c« beginnen."
+"Die Bezeichnung des Konfigurations-Eintrags kann nicht mit „%c“ beginnen."
 
 #: ../src/generic/filedlgg.cpp:349 ../src/gtk/filedlg.cpp:60
 msgid "Confirm"
@@ -2365,7 +2366,7 @@ msgstr "ControlLight"
 #: ../src/common/strconv.cpp:2262
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr "Konvertierung zum Zeichensatz »%s« funktioniert nicht."
+msgstr "Konvertierung zum Zeichensatz „%s“ funktioniert nicht."
 
 #: ../src/common/stockitem.cpp:149
 msgid "Convert"
@@ -2374,7 +2375,7 @@ msgstr "Konvertieren"
 #: ../src/html/htmlwin.cpp:1079
 #, c-format
 msgid "Copied to clipboard:\"%s\""
-msgstr "In Zwischenablage kopiert:»%s«"
+msgstr "In Zwischenablage kopiert:„%s“"
 
 #: ../src/generic/prntdlgg.cpp:247
 msgid "Copies:"
@@ -2400,7 +2401,7 @@ msgstr "Eck&radius:"
 #: ../src/html/chm.cpp:718
 #, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "Konnte temporäre Datei »%s« nicht erzeugen"
+msgstr "Konnte temporäre Datei „%s“ nicht erzeugen"
 
 #: ../src/html/chm.cpp:273
 #, c-format
@@ -2412,14 +2413,13 @@ msgid "Could not find tab for id"
 msgstr "Konnte Seite für ID nicht finden"
 
 #: ../src/gtk/notifmsg.cpp:108
-#, fuzzy
 msgid "Could not initalize libnotify."
-msgstr "Konnte die Ausrichtung nicht setzen."
+msgstr "Konnte libnotify nicht initialisieren."
 
 #: ../src/html/chm.cpp:444
 #, c-format
 msgid "Could not locate file '%s'."
-msgstr "Konnte Datei »%s« nicht finden."
+msgstr "Konnte Datei „%s“ nicht finden."
 
 #: ../src/common/filefn.cpp:1403
 msgid "Could not set current working directory"
@@ -2436,7 +2436,7 @@ msgstr "Kann Ausdruck nicht beginnen."
 
 #: ../src/common/wincmn.cpp:2125
 msgid "Could not transfer data to window"
-msgstr "Kann Daten nicht ins Fenster übertragen."
+msgstr "Kann Daten nicht ins Fenster übertragen"
 
 #: ../src/msw/imaglist.cpp:187 ../src/msw/imaglist.cpp:224
 #: ../src/msw/imaglist.cpp:249 ../src/msw/dragimag.cpp:185
@@ -2446,17 +2446,16 @@ msgstr "Kann Bild nicht zur Liste hinzufügen."
 
 #: ../src/osx/glcanvas_osx.cpp:414 ../src/unix/glx11.cpp:558
 #: ../src/msw/glcanvas.cpp:616
-#, fuzzy
 msgid "Couldn't create OpenGL context"
-msgstr "Kann keinen Timer anlegen."
+msgstr "Kann keinen OpenGL Inhalt erzeugen"
 
 #: ../src/msw/timer.cpp:134
 msgid "Couldn't create a timer"
-msgstr "Kann keinen Timer anlegen."
+msgstr "Kann keinen Timer erzeugen"
 
 #: ../src/osx/carbon/overlay.cpp:122
 msgid "Couldn't create the overlay window"
-msgstr "Konnte das überlagerte Fenster nicht erzeugen."
+msgstr "Konnte das überlagerte Fenster nicht erzeugen"
 
 #: ../src/common/translation.cpp:2024
 msgid "Couldn't enumerate translations"
@@ -2465,15 +2464,15 @@ msgstr "Konnte Übersetzungen nicht aufzählen"
 #: ../src/common/dynlib.cpp:120
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "Kann Symbol »%s« in der dynamischen Bibliothek nicht finden"
+msgstr "Kann Symbol „%s“ in der dynamischen Bibliothek nicht finden"
 
 #: ../src/msw/thread.cpp:915
 msgid "Couldn't get the current thread pointer"
-msgstr "Kann den aktuellen Threadzeiger nicht bekommen."
+msgstr "Kann den aktuellen Threadzeiger nicht bekommen"
 
 #: ../src/osx/carbon/overlay.cpp:129
 msgid "Couldn't init the context on the overlay window"
-msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
+msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren"
 
 #: ../src/common/imaggif.cpp:244
 msgid "Couldn't initialize GIF hash table."
@@ -2488,11 +2487,11 @@ msgstr ""
 #: ../src/unix/sound.cpp:470
 #, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "Klangdaten konnten nicht von »%s« geladen werden."
+msgstr "Klangdaten konnten nicht von „%s“ geladen werden."
 
 #: ../src/msw/dirdlg.cpp:435
 msgid "Couldn't obtain folder name"
-msgstr "Verzeichnisname konnte nicht ermittelt werden."
+msgstr "Verzeichnisname konnte nicht ermittelt werden"
 
 #: ../src/unix/sound_sdl.cpp:229
 #, c-format
@@ -2502,7 +2501,7 @@ msgstr "Fehler beim Öffnen der Audiodatei: %s"
 #: ../src/msw/ole/dataobj.cpp:377
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "Konnte Zwischenablage-Format »%s« nicht registrieren."
+msgstr "Konnte Zwischenablage-Format „%s“ nicht registrieren."
 
 #: ../src/msw/listctrl.cpp:869
 #, c-format
@@ -2535,7 +2534,7 @@ msgstr "Neues Verzeichnis anlegen"
 #: ../src/xrc/xmlres.cpp:2460
 #, c-format
 msgid "Creating %s \"%s\" failed."
-msgstr "Erstellung von %s »%s« fehlgeschlagen."
+msgstr "Erstellung von %s „%s“ fehlgeschlagen."
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1758
@@ -2583,11 +2582,11 @@ msgstr "Kyrillisch (ISO-8859-5)"
 
 #: ../src/common/paper.cpp:99
 msgid "D sheet, 22 x 34 in"
-msgstr "D Blatt, 22 x 34 Zoll"
+msgstr "D Blatt, 22 × 34 Zoll"
 
 #: ../src/msw/dde.cpp:703
 msgid "DDE poke request failed"
-msgstr "DDE »poke« Anfrage fehlgeschlagen"
+msgstr "DDE „poke“ Anfrage fehlgeschlagen"
 
 #: ../src/common/imagbmp.cpp:1169
 msgid "DIB Header: Encoding doesn't match bitdepth."
@@ -2611,7 +2610,7 @@ msgstr "DIB-Header: Unbekannte Kodierung."
 
 #: ../src/common/paper.cpp:121
 msgid "DL Envelope, 110 x 220 mm"
-msgstr "DL Umschlag, 110 x 220 mm"
+msgstr "DL Umschlag, 110 × 220 mm"
 
 #: ../src/richtext/richtextborderspage.cpp:613
 msgid "Dashed"
@@ -2620,7 +2619,7 @@ msgstr "Gestrichelt"
 #: ../src/generic/dbgrptg.cpp:300
 #, c-format
 msgid "Debug report \"%s\""
-msgstr "Fehlerbericht »%s«"
+msgstr "Fehlerbericht „%s“"
 
 #: ../src/common/debugrpt.cpp:210
 msgid "Debug report couldn't be created."
@@ -2703,17 +2702,17 @@ msgstr "Stil %s löschen?"
 #: ../src/unix/snglinst.cpp:301
 #, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "Ungenutzte Sperr-Datei »%s« wurde gelöscht."
+msgstr "Ungenutzte Sperr-Datei „%s“ wurde gelöscht."
 
 #: ../src/common/secretstore.cpp:220
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting password for \"%s/%s\" failed: %s."
-msgstr "Erstellung von %s »%s« fehlgeschlagen."
+msgstr "Löschen des Passwortes für „%s/%s“ fehlgeschlagen: %s."
 
 #: ../src/common/module.cpp:124
 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
-msgstr "Abhängigkeit »%s« des Moduls »%s« existiert nicht."
+msgstr "Abhängigkeit „%s“ des Moduls „%s“ existiert nicht."
 
 #: ../src/common/stockitem.cpp:196
 msgid "Descending"
@@ -2757,12 +2756,12 @@ msgstr "Verzeichnisse"
 #: ../src/common/filefn.cpp:1183
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "Verzeichnis »%s« konnte nicht angelegt werden."
+msgstr "Verzeichnis „%s“ konnte nicht angelegt werden"
 
 #: ../src/common/filefn.cpp:1197
 #, c-format
 msgid "Directory '%s' couldn't be deleted"
-msgstr "Verzeichnis »%s« konnte nicht gelöscht werden."
+msgstr "Verzeichnis „%s“ konnte nicht gelöscht werden"
 
 #: ../src/generic/dirdlgg.cpp:204
 msgid "Directory does not exist"
@@ -2770,7 +2769,7 @@ msgstr "Verzeichnis existiert nicht"
 
 #: ../src/generic/filectrlg.cpp:1399
 msgid "Directory doesn't exist."
-msgstr "Verzeichnis existiert nicht"
+msgstr "Verzeichnis existiert nicht."
 
 #: ../src/common/docview.cpp:457
 msgid "Discard changes and reload the last saved version?"
@@ -2781,7 +2780,7 @@ msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr ""
-"Zeige alle Indexelemente an, die den gegebenen Suchbegriff enthalten. Groß-/"
+"Alle Indexelemente anzeigen, die den gegebenen Suchbegriff enthalten. Groß-/"
 "Kleinschreibung wird nicht beachtet."
 
 #: ../src/html/helpwnd.cpp:679
@@ -2838,7 +2837,7 @@ msgstr "Verdoppeln"
 
 #: ../src/common/paper.cpp:176
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
-msgstr "Doppelte Japanische Postkarte Rotiert 148 x 200 mm"
+msgstr "Doppelte Japanische Postkarte Rotiert 148 × 200 mm"
 
 #: ../src/common/xtixml.cpp:273
 #, c-format
@@ -2857,7 +2856,7 @@ msgstr "Freigeben"
 
 #: ../src/common/paper.cpp:100
 msgid "E sheet, 34 x 44 in"
-msgstr "E Blatt, 34 x 44 Zoll"
+msgstr "E Blatt, 34 × 44 Zoll"
 
 #: ../src/unix/fswatcher_inotify.cpp:561
 msgid "EOF while reading from inotify descriptor"
@@ -2880,12 +2879,12 @@ msgstr "Benötigte Zeit:"
 #: ../src/richtext/richtextsizepage.cpp:465
 #: ../src/richtext/richtextsizepage.cpp:467
 msgid "Enable the height value."
-msgstr "Höhenwert berücksichtigen."
+msgstr "Höhenwert einschalten."
 
 #: ../src/richtext/richtextsizepage.cpp:438
 #: ../src/richtext/richtextsizepage.cpp:440
 msgid "Enable the maximum width value."
-msgstr "Erlaube den maximalen Breitenwert."
+msgstr "Maximalen Breitenwert einschalten."
 
 #: ../src/richtext/richtextsizepage.cpp:411
 #: ../src/richtext/richtextsizepage.cpp:413
@@ -2895,7 +2894,7 @@ msgstr "Minimalen Höhenwert einschalten."
 #: ../src/richtext/richtextsizepage.cpp:384
 #: ../src/richtext/richtextsizepage.cpp:386
 msgid "Enable the minimum width value."
-msgstr "Erlaube den minimalen Breitenwert."
+msgstr "Minimalen Breitenwert einschalten."
 
 #: ../src/richtext/richtextsizepage.cpp:319
 #: ../src/richtext/richtextsizepage.cpp:321
@@ -2905,12 +2904,12 @@ msgstr "Breitenwert einschalten."
 #: ../src/richtext/richtextsizepage.cpp:280
 #: ../src/richtext/richtextsizepage.cpp:282
 msgid "Enable vertical alignment."
-msgstr "Vertikalabgleich einschalten."
+msgstr "Vertikale Ausrichtung einschalten."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:162
 #: ../src/richtext/richtextbackgroundpage.cpp:164
 msgid "Enables a background colour."
-msgstr "Ermöglicht eine Hintergrundfarbe."
+msgstr "Aktiviert eine Hintergrundfarbe."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:196
 #: ../src/richtext/richtextbackgroundpage.cpp:198
@@ -2920,22 +2919,22 @@ msgstr "Aktiviert einen Schatten."
 #: ../src/richtext/richtextbackgroundpage.cpp:300
 #: ../src/richtext/richtextbackgroundpage.cpp:302
 msgid "Enables the blur distance."
-msgstr "Weichzeichnungsentfernung aktivieren."
+msgstr "Aktiviert die Entfernung der Weichzeichnung."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:260
 #: ../src/richtext/richtextbackgroundpage.cpp:262
 msgid "Enables the shadow colour."
-msgstr "Aktiviert die Schattenfarbe."
+msgstr "Aktiviert die Farbe des Schattens."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:327
 #: ../src/richtext/richtextbackgroundpage.cpp:329
 msgid "Enables the shadow opacity."
-msgstr "Aktiviert die Schattendeckkraft."
+msgstr "Aktiviert die Deckkraft des Schattens."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:273
 #: ../src/richtext/richtextbackgroundpage.cpp:275
 msgid "Enables the shadow spread."
-msgstr "Aktiviert die Schatten-Ausbreitung."
+msgstr "Aktiviert die Ausbreitung des Schattens."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:66
@@ -2949,28 +2948,28 @@ msgstr "Eingabe"
 
 #: ../src/richtext/richtextstyledlg.cpp:934
 msgid "Enter a box style name"
-msgstr "Namen für Rahmen-Stil angeben"
+msgstr "Namen für den Rahmen-Stil eintragen"
 
 #: ../src/richtext/richtextstyledlg.cpp:606
 msgid "Enter a character style name"
-msgstr "Eingabe eines Zeichenstils"
+msgstr "Name des Zeichenstils eintragen"
 
 #: ../src/richtext/richtextstyledlg.cpp:820
 msgid "Enter a list style name"
-msgstr "Eingabe eines Listenstils"
+msgstr "Name des Listenstils eintragen"
 
 #: ../src/richtext/richtextstyledlg.cpp:893
 msgid "Enter a new style name"
-msgstr "Einen neuen Stilnamen eingeben"
+msgstr "Neuen Stilnamen eintragen"
 
 #: ../src/richtext/richtextstyledlg.cpp:654
 msgid "Enter a paragraph style name"
-msgstr "Eingabe eines Absatzstils"
+msgstr "Name des Absatzstils eintragen"
 
 #: ../src/generic/dbgrptg.cpp:174
 #, c-format
 msgid "Enter command to open file \"%s\":"
-msgstr "Befehl zum Öffnen von Datei »%s« eingeben:"
+msgstr "Befehl zum Öffnen von Datei „%s“ eingeben:"
 
 #: ../src/generic/helpext.cpp:459
 msgid "Entries found"
@@ -2978,15 +2977,15 @@ msgstr "Einträge gefunden"
 
 #: ../src/common/paper.cpp:142
 msgid "Envelope Invite 220 x 220 mm"
-msgstr "Umschlag Einladung 220 x 220 mm"
+msgstr "Umschlag Einladung 220 × 220 mm"
 
 #: ../src/common/config.cpp:469
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr ""
-"Auswerten der Umgebungsvariablen schlug fehl. Es fehlt »%c« an Position %u "
-"in »%s«."
+"Auswerten der Umgebungsvariablen schlug fehl. Es fehlt „%c“ an Position %u "
+"in „%s“."
 
 #: ../src/generic/filedlgg.cpp:357 ../src/generic/dirctrlg.cpp:570
 #: ../src/generic/dirctrlg.cpp:588 ../src/generic/dirctrlg.cpp:599
@@ -3007,9 +3006,9 @@ msgid "Error closing kqueue instance"
 msgstr "Fehler schließt kqueue Vorgang"
 
 #: ../src/common/filefn.cpp:1049
-#, fuzzy, c-format
+#, c-format
 msgid "Error copying the file '%s' to '%s'."
-msgstr "Konnte die Datei »%s« nicht nach »%s« kopieren"
+msgstr "Fehler beim Speichern der Datei „%s“ nach „%s“."
 
 #: ../src/generic/dirdlgg.cpp:222
 msgid "Error creating directory"
@@ -3070,23 +3069,23 @@ msgstr "Ausführen"
 #: ../src/msw/utilsexc.cpp:876
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "Befehlsausführung »%s« schlug fehl"
+msgstr "Befehlsausführung „%s“ schlug fehl"
 
 #: ../src/common/paper.cpp:105
 msgid "Executive, 7 1/4 x 10 1/2 in"
-msgstr "Executive, 7 1/4 x 10 1/2 Zoll"
+msgstr "Executive, 7 1/4 × 10 1/2 Zoll"
 
 #. TRANSLATORS: Action for manipulating a tree control
 #: ../src/generic/datavgen.cpp:6009
 msgid "Expand"
-msgstr ""
+msgstr "Aufklappen"
 
 #: ../src/msw/registry.cpp:1240
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr ""
-"Exportiere Registrierungsschlüssel: Datei »%s« besteht bereits und wird "
+"Exportiere Registrierungsschlüssel: Datei „%s“ besteht bereits und wird "
 "nicht überschrieben."
 
 #: ../src/common/fmapbase.cpp:195
@@ -3096,7 +3095,7 @@ msgstr "Erweiterter Unix-Zeichensatz für Japanisch (EUC-JP)"
 #: ../src/html/chm.cpp:725
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "Extrahieren von »%s« in »%s« schlug fehl."
+msgstr "Extrahieren von „%s“ in „%s“ schlug fehl."
 
 #: ../src/common/accelcmn.cpp:249 ../src/common/accelcmn.cpp:344
 msgid "F"
@@ -3105,7 +3104,7 @@ msgstr "F"
 #. TRANSLATORS: Label of font face name
 #: ../src/propgrid/advprops.cpp:672
 msgid "Face Name"
-msgstr "Schriftartname"
+msgstr "Schriftname"
 
 #: ../src/unix/snglinst.cpp:269
 msgid "Failed to access lock file."
@@ -3132,21 +3131,21 @@ msgstr "Änderung des Video-Modus fehlgeschlagen"
 #: ../src/common/image.cpp:3277
 #, c-format
 msgid "Failed to check format of image file \"%s\"."
-msgstr "Überprüfung des Formats der Bilddatei »%s« fehlgeschlagen."
+msgstr "Überprüfung des Formats der Bilddatei „%s“ fehlgeschlagen."
 
 #: ../src/common/debugrpt.cpp:239
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
-msgstr "Konnte Fehlerberichtsverzeichnis »%s« nicht aufräumen."
+msgstr "Konnte Fehlerberichtsverzeichnis „%s“ nicht aufräumen."
 
 #: ../src/common/filename.cpp:192
 msgid "Failed to close file handle"
-msgstr "Konnte Datei-Handle nicht schließen."
+msgstr "Konnte Datei-Handle nicht schließen"
 
 #: ../src/unix/snglinst.cpp:340
 #, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "Konnte Sperr-Datei »%s« nicht schließen"
+msgstr "Konnte Sperr-Datei „%s“ nicht schließen"
 
 #: ../src/msw/clipbrd.cpp:112
 msgid "Failed to close the clipboard."
@@ -3155,11 +3154,12 @@ msgstr "Konnte Zwischenablage nicht schließen."
 #: ../src/x11/utils.cpp:208
 #, c-format
 msgid "Failed to close the display \"%s\""
-msgstr "Konnte das Display »%s« nicht schließen"
+msgstr "Konnte das Display „%s“ nicht schließen"
 
 #: ../src/msw/dialup.cpp:797
 msgid "Failed to connect: missing username/password."
-msgstr "Verbindung fehlgeschlagen: Es fehlt der Benutzername bzw. das Passwort"
+msgstr ""
+"Verbindung fehlgeschlagen: Es fehlt der Benutzername bzw. das Passwort."
 
 #: ../src/msw/dialup.cpp:743
 msgid "Failed to connect: no ISP to dial."
@@ -3168,7 +3168,7 @@ msgstr "Verbindungsversuch fehlgeschlagen: kein anwählbares ISP."
 #: ../src/common/textfile.cpp:203
 #, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
-msgstr "Konnte die Datei »%s« nicht nach Unicode konvertieren."
+msgstr "Konnte die Datei „%s“ nicht nach Unicode konvertieren."
 
 #: ../src/generic/logg.cpp:956
 msgid "Failed to copy dialog contents to the clipboard."
@@ -3177,24 +3177,24 @@ msgstr "Kopieren des Dialoginhalts in die Zwischenablage fehlgeschlagen."
 #: ../src/msw/registry.cpp:692
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "Kopieren des Registry-Werts »%s« fehlgeschlagen"
+msgstr "Kopieren des Registry-Werts „%s“ fehlgeschlagen"
 
 #: ../src/msw/registry.cpp:701
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr ""
-"Kopieren des Inhalts des Registrierungsschlüssels »%s« nach »%s« "
+"Kopieren des Inhalts des Registrierungsschlüssels „%s“ nach „%s“ "
 "fehlgeschlagen."
 
 #: ../src/common/filefn.cpp:1015
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "Konnte die Datei »%s« nicht nach »%s« kopieren"
+msgstr "Konnte die Datei „%s“ nicht nach „%s“ kopieren"
 
 #: ../src/msw/registry.cpp:679
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "Kopieren des Registrierungsschlüssels von »%s« in »%s« fehlgeschlagen."
+msgstr "Kopieren des Registrierungsschlüssels von „%s“ in „%s“ fehlgeschlagen."
 
 #: ../src/msw/dde.cpp:1070
 msgid "Failed to create DDE string"
@@ -3206,7 +3206,7 @@ msgstr "Erstellung des MDI-Hauptrahmens fehlgeschlagen."
 
 #: ../src/common/filename.cpp:1027
 msgid "Failed to create a temporary file name"
-msgstr "Konnte keinen temporären Dateinamen erstellen."
+msgstr "Konnte keinen temporären Dateinamen erstellen"
 
 #: ../src/msw/utilsexc.cpp:228
 msgid "Failed to create an anonymous pipe"
@@ -3215,21 +3215,21 @@ msgstr "Konnte keine anonyme Unix-Pipe erstellen"
 #: ../src/msw/ole/automtn.cpp:522
 #, c-format
 msgid "Failed to create an instance of \"%s\""
-msgstr "Erzeugen eines Exemplars von »%s« fehlgeschlagen."
+msgstr "Erzeugen eines Exemplars von „%s“ fehlgeschlagen."
 
 #: ../src/msw/dde.cpp:437
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "Aufbau der Verbindung zum Server »%s« »on topic« »%s« fehlgeschlagen"
+msgstr "Aufbau der Verbindung zum Server „%s“ „on topic“ „%s“ fehlgeschlagen"
 
 #: ../src/msw/cursor.cpp:204
 msgid "Failed to create cursor."
-msgstr "Cursor konnte nicht erzeugt werden"
+msgstr "Cursor konnte nicht erzeugt werden."
 
 #: ../src/common/debugrpt.cpp:209
 #, c-format
 msgid "Failed to create directory \"%s\""
-msgstr "Konnte das Verzeichnis »%s« nicht erzeugen."
+msgstr "Konnte das Verzeichnis „%s“ nicht erstellen."
 
 #: ../src/generic/dirdlgg.cpp:220
 #, c-format
@@ -3237,17 +3237,17 @@ msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"Konnte Verzeichnis »%s« nicht erstellen\n"
+"Konnte Verzeichnis „%s“ nicht erstellen\n"
 "(Haben Sie die nötigen Zugriffsrechte?)"
 
 #: ../src/unix/epolldispatcher.cpp:84
 msgid "Failed to create epoll descriptor"
-msgstr "Epoll Beschreibungselement konnte nicht erzeugt werden"
+msgstr "Epoll Beschreibungselement konnte nicht erstellt werden"
 
 #: ../src/msw/mimetype.cpp:238
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "Konnte keinen Registrierungseintrag für »%s«-Dateien erstellen."
+msgstr "Konnte keinen Registrierungseintrag für „%s“-Dateien erstellen."
 
 #: ../src/msw/fdrepdlg.cpp:409
 #, c-format
@@ -3273,7 +3273,7 @@ msgstr "Auflisten der Video-Modi fehlgeschlagen"
 
 #: ../src/msw/dde.cpp:722
 msgid "Failed to establish an advise loop with DDE server"
-msgstr "Aufbau einer »advise Schleife« mit dem DDE-Server fehlgeschlagen"
+msgstr "Aufbau einer „advise Schleife“ mit dem DDE-Server fehlgeschlagen"
 
 #: ../src/msw/dialup.cpp:629 ../src/msw/dialup.cpp:863
 #, c-format
@@ -3283,7 +3283,7 @@ msgstr "Aufbau der DFÜ-Verbindung fehlgeschlagen: %s"
 #: ../src/unix/utilsunx.cpp:611
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "Kann »%s« nicht ausführen\n"
+msgstr "Kann „%s“ nicht ausführen\n"
 
 #: ../src/common/debugrpt.cpp:720
 msgid "Failed to execute curl, please install it in PATH."
@@ -3292,7 +3292,7 @@ msgstr "Konnte curl nicht starten, bitte im PATH installieren."
 #: ../src/msw/ole/automtn.cpp:505
 #, c-format
 msgid "Failed to find CLSID of \"%s\""
-msgstr "Konnte CLSID von »%s« nicht finden"
+msgstr "Konnte CLSID von „%s“ nicht finden"
 
 #: ../src/common/regex.cpp:431 ../src/common/regex.cpp:479
 #, c-format
@@ -3302,12 +3302,12 @@ msgstr "Konnte keine Übereinstimmung mit regulärem Ausdruck %s finden"
 #: ../src/msw/dialup.cpp:695
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "Konnte ISP-Namen »%s« nicht ermitteln"
+msgstr "Konnte ISP-Namen „%s“ nicht ermitteln"
 
 #: ../src/msw/ole/automtn.cpp:574
 #, c-format
 msgid "Failed to get OLE automation interface for \"%s\""
-msgstr "Konnte die OLE Automatisierungsschnittstelle für »%s« nicht bekommen"
+msgstr "Konnte die OLE Automatisierungsschnittstelle für „%s“ nicht bekommen"
 
 #: ../src/msw/clipbrd.cpp:711
 msgid "Failed to get data from the clipboard"
@@ -3315,7 +3315,7 @@ msgstr "Konnte Daten nicht aus der Zwischenablage kopieren"
 
 #: ../src/common/time.cpp:223
 msgid "Failed to get the local system time"
-msgstr "Versuch örtliche Systemzeit zu bekommen, fehlgeschlagen."
+msgstr "Versuch örtliche Systemzeit zu bekommen, fehlgeschlagen"
 
 #: ../src/common/filefn.cpp:1345
 msgid "Failed to get the working directory"
@@ -3345,7 +3345,7 @@ msgstr "Einfügen von Text in das Steuerelement fehlgeschlagen."
 #: ../src/unix/snglinst.cpp:241
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
-msgstr "Konnte die Sperr-Datei »%s« nicht lesen"
+msgstr "Konnte die Sperr-Datei „%s“ nicht lesen"
 
 #: ../src/unix/appunix.cpp:182
 msgid "Failed to install signal handler"
@@ -3367,22 +3367,22 @@ msgstr "Konnte Prozess %d nicht abbrechen"
 #: ../src/common/image.cpp:2500
 #, c-format
 msgid "Failed to load bitmap \"%s\" from resources."
-msgstr "Konnte das Bitmap »%s« aus der Ressource nicht laden."
+msgstr "Konnte das Bitmap „%s“ aus der Ressource nicht laden."
 
 #: ../src/common/image.cpp:2509
 #, c-format
 msgid "Failed to load icon \"%s\" from resources."
-msgstr "Konnte das Symbol »%s« aus der Ressource nicht laden."
+msgstr "Konnte das Symbol „%s“ aus der Ressource nicht laden."
 
 #: ../src/common/iconbndl.cpp:225
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load icons from resource '%s'."
-msgstr "Konnte das Symbol »%s« aus der Ressource nicht laden."
+msgstr "Konnte die Symbole aus der Ressource „%s“ nicht laden."
 
 #: ../src/common/iconbndl.cpp:200
 #, c-format
 msgid "Failed to load image %%d from file '%s'."
-msgstr "Konnte das Bild %%d aus der Datei »%s« nicht laden."
+msgstr "Konnte das Bild %%d aus der Datei „%s“ nicht laden."
 
 #: ../src/common/iconbndl.cpp:208
 #, c-format
@@ -3392,12 +3392,12 @@ msgstr "Konnte das Bild %d aus dem Strom nicht laden."
 #: ../src/common/image.cpp:2587 ../src/common/image.cpp:2606
 #, c-format
 msgid "Failed to load image from file \"%s\"."
-msgstr "Konnte das Bild aus der Datei »%s« nicht laden."
+msgstr "Konnte das Bild aus der Datei „%s“ nicht laden."
 
 #: ../src/msw/enhmeta.cpp:97
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
-msgstr "Konnte Metadatei aus Datei »%s« nicht laden."
+msgstr "Konnte Metadatei aus Datei „%s“ nicht laden."
 
 #: ../src/msw/volume.cpp:327
 msgid "Failed to load mpr.dll."
@@ -3406,27 +3406,27 @@ msgstr "Konnte mpr.dll nicht laden."
 #: ../src/msw/utils.cpp:953
 #, c-format
 msgid "Failed to load resource \"%s\"."
-msgstr "Konnte die Ressource »%s« nicht laden."
+msgstr "Konnte die Ressource „%s“ nicht laden."
 
 #: ../src/common/dynlib.cpp:92
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "Laden der dynamischen Bibliothek »%s« fehlgeschlagen"
+msgstr "Laden der dynamischen Bibliothek „%s“ fehlgeschlagen"
 
 #: ../src/osx/core/sound.cpp:145
 #, c-format
 msgid "Failed to load sound from \"%s\" (error %d)."
-msgstr "Fehler beim Laden des Klangs von »%s« (Fehler %d)."
+msgstr "Fehler beim Laden des Klangs von „%s“ (Fehler %d)."
 
 #: ../src/msw/utils.cpp:960
 #, c-format
 msgid "Failed to lock resource \"%s\"."
-msgstr "Konnte die Ressource »%s« nicht sperren."
+msgstr "Konnte die Ressource „%s“ nicht sperren."
 
 #: ../src/unix/snglinst.cpp:198
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "Konnte die Sperr-Datei »%s« nicht sperren"
+msgstr "Konnte die Sperr-Datei „%s“ nicht sperren"
 
 #: ../src/unix/epolldispatcher.cpp:136
 #, c-format
@@ -3436,7 +3436,7 @@ msgstr "Wechsel von Beschreibung %d in Epoll Beschreibung %d fehlgeschlagen"
 #: ../src/common/filename.cpp:2575
 #, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "Konnte Zugriffszeit von Datei »%s« nicht ändern"
+msgstr "Konnte Zugriffszeit von Datei „%s“ nicht ändern"
 
 #: ../src/common/selectdispatcher.cpp:258
 msgid "Failed to monitor I/O channels"
@@ -3445,32 +3445,32 @@ msgstr "Die Überwachung der I/O Kanäle ist fehlgeschlagen"
 #: ../src/common/filename.cpp:175
 #, c-format
 msgid "Failed to open '%s' for reading"
-msgstr "Konnte »%s« nicht zum Lesen öffnen"
+msgstr "Konnte „%s“ nicht zum Lesen öffnen"
 
 #: ../src/common/filename.cpp:180
 #, c-format
 msgid "Failed to open '%s' for writing"
-msgstr "Konnte »%s« nicht zum Schreiben öffnen"
+msgstr "Konnte „%s“ nicht zum Schreiben öffnen"
 
 #: ../src/html/chm.cpp:141
 #, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "CHM-Archiv »%s« lässt sich nicht öffnen."
+msgstr "CHM-Archiv „%s“ lässt sich nicht öffnen."
 
 #: ../src/common/utilscmn.cpp:1126
 #, c-format
 msgid "Failed to open URL \"%s\" in default browser."
-msgstr "Konnte die URL »%s« nicht im voreingestellten Browser öffnen."
+msgstr "Konnte die URL „%s“ nicht im voreingestellten Browser öffnen."
 
 #: ../include/wx/msw/private/fswatcher.h:92
 #, c-format
 msgid "Failed to open directory \"%s\" for monitoring."
-msgstr "Konnte das Verzeichnis »%s« nicht zur Überwachung öffnen."
+msgstr "Konnte das Verzeichnis „%s“ nicht zur Überwachung öffnen."
 
 #: ../src/x11/utils.cpp:227
 #, c-format
 msgid "Failed to open display \"%s\"."
-msgstr "Öffnen des Displays »%s« fehlgeschlagen."
+msgstr "Öffnen des Displays „%s“ fehlgeschlagen."
 
 #: ../src/common/filename.cpp:1062
 msgid "Failed to open temporary file."
@@ -3483,12 +3483,12 @@ msgstr "Konnte Zwischenablage nicht öffnen."
 #: ../src/common/translation.cpp:1184
 #, c-format
 msgid "Failed to parse Plural-Forms: '%s'"
-msgstr "Analyse der Pluralformen fehlgeschlagen: »%s«"
+msgstr "Analyse der Pluralformen fehlgeschlagen: „%s“"
 
 #: ../src/unix/mediactrl.cpp:1214
 #, c-format
 msgid "Failed to prepare playing \"%s\"."
-msgstr "Fehler bei der Vorbereitung zum Abspielen von »%s«."
+msgstr "Fehler bei der Vorbereitung zum Abspielen von „%s“."
 
 #: ../src/msw/clipbrd.cpp:600
 msgid "Failed to put data on the clipboard"
@@ -3505,7 +3505,7 @@ msgstr "Lesen der Konfigurationsoptionen fehlgeschlagen."
 #: ../src/common/docview.cpp:681
 #, c-format
 msgid "Failed to read document from the file \"%s\"."
-msgstr "Konnte Dokument aus der Datei »%s« nicht lesen."
+msgstr "Konnte Dokument aus der Datei „%s“ nicht lesen."
 
 #: ../src/dfb/evtloop.cpp:98
 msgid "Failed to read event from DirectFB pipe"
@@ -3526,34 +3526,34 @@ msgstr "Umleitung der Ein-/Ausgabe des Unterprozesses fehlgeschlagen"
 #: ../src/msw/dde.cpp:288
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "Versuch DDE-Server »%s« zu registrieren, fehlgeschlagen"
+msgstr "Versuch DDE-Server „%s“ zu registrieren, fehlgeschlagen"
 
 #: ../src/common/fontmap.cpp:245
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr ""
-"Versuch fehlgeschlagen, an die Kodierung für den Zeichensatz »%s« zu "
+"Versuch fehlgeschlagen, an die Kodierung für den Zeichensatz „%s“ zu "
 "erinnern."
 
 #: ../src/common/debugrpt.cpp:227
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
-msgstr "Konnte Fehlerberichtsdatei »%s« nicht entfernen."
+msgstr "Konnte Fehlerberichtsdatei „%s“ nicht entfernen."
 
 #: ../src/unix/snglinst.cpp:328
 #, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "Konnte Sperr-Datei »%s« nicht löschen."
+msgstr "Konnte Sperr-Datei „%s“ nicht löschen."
 
 #: ../src/unix/snglinst.cpp:288
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "Konnte unbenutzte Sperr-Datei »%s« nicht entfernen."
+msgstr "Konnte unbenutzte Sperr-Datei „%s“ nicht entfernen."
 
 #: ../src/msw/registry.cpp:529
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "Umbenennen des Registrierungswertes »%s« in »%s« fehlgeschlagen"
+msgstr "Umbenennen des Registrierungswertes „%s“ in „%s“ fehlgeschlagen."
 
 #: ../src/common/filefn.cpp:1122
 #, c-format
@@ -3561,19 +3561,19 @@ msgid ""
 "Failed to rename the file '%s' to '%s' because the destination file already "
 "exists."
 msgstr ""
-"Umbenennen der Datei »%s« nach »%s« fehlgeschlagen, da die Zieldatei bereits "
+"Umbenennen der Datei „%s“ nach „%s“ fehlgeschlagen, da die Zieldatei bereits "
 "existiert."
 
 #: ../src/msw/registry.cpp:634
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr ""
-"Umbenennen des Registrierungsschlüssels von »%s« in »%s« fehlgeschlagen."
+"Umbenennen des Registrierungsschlüssels von „%s“ in „%s“ fehlgeschlagen."
 
 #: ../src/common/filename.cpp:2671
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "Konnte Zugriffszeit von Datei »%s« nicht ermitteln"
+msgstr "Konnte Zugriffszeit von Datei „%s“ nicht ermitteln"
 
 #: ../src/msw/dialup.cpp:468
 msgid "Failed to retrieve text of RAS error message"
@@ -3587,12 +3587,12 @@ msgstr ""
 #: ../src/common/docview.cpp:652
 #, c-format
 msgid "Failed to save document to the file \"%s\"."
-msgstr "Das Dokument konnte nicht in die Datei »%s« gesichert werden."
+msgstr "Das Dokument konnte nicht in die Datei „%s“ gesichert werden."
 
 #: ../src/msw/dib.cpp:269
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "Das Bitmap-Bild konnte nicht in der Datei »%s« geschrieben werden."
+msgstr "Das Bitmap-Bild konnte nicht in der Datei „%s“ geschrieben werden."
 
 #: ../src/msw/dde.cpp:763
 msgid "Failed to send DDE advise notification"
@@ -3601,7 +3601,7 @@ msgstr "Versuch fehlgeschlagen, eine DDE-Benachrichtigung zu schicken"
 #: ../src/common/ftp.cpp:402
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "Konnte den FTP-Transfermodus nicht auf »%s« setzen."
+msgstr "Konnte den FTP-Transfermodus nicht auf „%s“ setzen."
 
 #: ../src/msw/clipbrd.cpp:427
 msgid "Failed to set clipboard data."
@@ -3610,7 +3610,7 @@ msgstr "Konnte Dateien nicht in die Zwischenablage kopieren."
 #: ../src/unix/snglinst.cpp:181
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "Konnte die Zugriffsrechte für Datei »%s« nicht setzen"
+msgstr "Konnte die Zugriffsrechte für Datei „%s“ nicht setzen"
 
 #: ../src/unix/utilsunx.cpp:668
 msgid "Failed to set process priority"
@@ -3644,7 +3644,7 @@ msgstr ""
 #: ../src/common/fs_mem.cpp:261
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "Versuch das Bild »%s« im VFS-Speicher zu laden, fehlgeschlagen!"
+msgstr "Versuch das Bild „%s“ im VFS-Speicher zu laden, fehlgeschlagen!"
 
 #: ../src/dfb/evtloop.cpp:170
 msgid "Failed to switch DirectFB pipe to non-blocking mode"
@@ -3662,7 +3662,7 @@ msgstr "Versuch den Thread zu beenden, fehlgeschlagen."
 #: ../src/msw/dde.cpp:741
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr ""
-"Versuch fehlgeschlagen, die »advise Schleife« mit DDE-Server zu beenden."
+"Versuch fehlgeschlagen, die „advise Schleife“ mit DDE-Server zu beenden"
 
 #: ../src/msw/dialup.cpp:938
 #, c-format
@@ -3672,17 +3672,17 @@ msgstr "Versuch fehlgeschlagen, die DFÜ-Verbindung zu beenden: %s"
 #: ../src/common/filename.cpp:2590
 #, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "Konnte die Datei »%s« nicht »berühren«"
+msgstr "Konnte die Datei „%s“ nicht „berühren“"
 
 #: ../src/unix/snglinst.cpp:334
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "Konnte die Sperrung von Datei »%s« nicht aufheben"
+msgstr "Konnte die Sperrung von Datei „%s“ nicht aufheben"
 
 #: ../src/msw/dde.cpp:309
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "Die Registrierung des DDE-Servers »%s« konnte nicht aufgehoben werden"
+msgstr "Die Registrierung des DDE-Servers „%s“ konnte nicht aufgehoben werden"
 
 #: ../src/unix/epolldispatcher.cpp:155
 #, c-format
@@ -3701,7 +3701,7 @@ msgstr "Konnte den Fehlerbericht nicht hochladen (Fehlercode %d)."
 #: ../src/unix/snglinst.cpp:168
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "Konnte Sperr-Datei »%s« nicht schreiben"
+msgstr "Konnte Sperr-Datei „%s“ nicht schreiben"
 
 #. TRANSLATORS: Name of Boolean false value
 #: ../src/propgrid/propgrid.cpp:209
@@ -3720,28 +3720,28 @@ msgstr "Datei"
 #: ../src/common/docview.cpp:669
 #, c-format
 msgid "File \"%s\" could not be opened for reading."
-msgstr "Die Datei »%s« konnte nicht zum Lesen geöffnet werden."
+msgstr "Die Datei „%s“ konnte nicht zum Lesen geöffnet werden."
 
 #: ../src/common/docview.cpp:646
 #, c-format
 msgid "File \"%s\" could not be opened for writing."
-msgstr "Die Datei »%s« konnte nicht zum Schreiben geöffnet werden."
+msgstr "Die Datei „%s“ konnte nicht zum Schreiben geöffnet werden."
 
 #: ../src/generic/filedlgg.cpp:346 ../src/gtk/filedlg.cpp:57
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr ""
-"Datei »%s« existiert bereits, möchten Sie diese wirklich überschreiben?"
+"Datei „%s“ existiert bereits, möchten Sie diese wirklich überschreiben?"
 
 #: ../src/common/filefn.cpp:1156
 #, c-format
 msgid "File '%s' couldn't be removed"
-msgstr "Die Datei »%s« konnte nicht gelöscht werden."
+msgstr "Die Datei „%s“ konnte nicht gelöscht werden"
 
 #: ../src/common/filefn.cpp:1139
 #, c-format
 msgid "File '%s' couldn't be renamed '%s'"
-msgstr "Die Datei »%s« konnte nicht nach »%s« umbenannt werden."
+msgstr "Die Datei „%s“ konnte nicht nach „%s“ umbenannt werden."
 
 #: ../src/richtext/richtextctrl.cpp:3081 ../src/common/textcmn.cpp:953
 msgid "File couldn't be loaded."
@@ -3758,7 +3758,7 @@ msgstr "Dateifehler"
 
 #: ../src/generic/dirctrlg.cpp:588 ../src/generic/filectrlg.cpp:770
 msgid "File name exists already."
-msgstr "Dateiname bereits vorhanden"
+msgstr "Dateiname bereits vorhanden."
 
 #: ../src/motif/filedlg.cpp:220
 msgid "Files"
@@ -3807,7 +3807,7 @@ msgstr "Diskette"
 
 #: ../src/common/paper.cpp:111
 msgid "Folio, 8 1/2 x 13 in"
-msgstr "Folio, 8 1/2 x 13 Zoll"
+msgstr "Folio, 8 1/2 × 13 Zoll"
 
 #: ../src/richtext/richtextformatdlg.cpp:344 ../src/osx/carbon/fontdlg.cpp:287
 #: ../src/common/stockitem.cpp:194
@@ -3838,7 +3838,7 @@ msgstr ""
 
 #: ../src/unix/utilsunx.cpp:645
 msgid "Fork failed"
-msgstr "»Fork« fehlgeschlagen"
+msgstr "„Fork“ fehlgeschlagen"
 
 #: ../src/common/stockitem.cpp:161
 msgid "Forward"
@@ -3879,8 +3879,7 @@ msgid ""
 "please install GTK+ 2.12 or later."
 msgstr ""
 "Das GTK+, das auf dieser Maschine installiert ist, ist zu alt um "
-"Bildschirmanordnung zu unterstützen, bitte GTK+ 2.12 oder neuer "
-"installieren. "
+"Bildschirmanordnung zu unterstützen, bitte GTK+ 2.12 oder neuer installieren."
 
 #: ../src/univ/themes/gtk.cpp:525
 msgid "GTK+ theme"
@@ -3896,11 +3895,11 @@ msgstr "Generisches PostScript"
 
 #: ../src/common/paper.cpp:135
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
-msgstr "German Legal Endlospapier, 21,59 x 33,02 cm"
+msgstr "German Legal Endlospapier, 21,59 × 33,02 cm"
 
 #: ../src/common/paper.cpp:134
 msgid "German Std Fanfold, 8 1/2 x 12 in"
-msgstr "German Std Endlospapier, 8 1/2 x 12 Zoll"
+msgstr "German Std Endlospapier, 8 1/2 × 12 Zoll"
 
 #: ../include/wx/xtiprop.h:184
 msgid "GetProperty called w/o valid getter"
@@ -3916,11 +3915,11 @@ msgstr "GetPropertyCollection aufgerufen ohne gültigen Collection getter"
 
 #: ../src/html/helpwnd.cpp:660
 msgid "Go back"
-msgstr "Vorherige HTML-Seite zeigen"
+msgstr "Zurück"
 
 #: ../src/html/helpwnd.cpp:661
 msgid "Go forward"
-msgstr "Nächste HTML-Seite zeigen"
+msgstr "Vorwärts"
 
 #: ../src/html/helpwnd.cpp:663
 msgid "Go one level up in document hierarchy"
@@ -3932,7 +3931,7 @@ msgstr "Gehe zum Benutzerverzeichnis"
 
 #: ../src/generic/filedlgg.cpp:205
 msgid "Go to parent directory"
-msgstr "Gehe zum »Parent«-Verzeichnis"
+msgstr "Gehe zum „Parent“-Verzeichnis"
 
 #: ../src/generic/aboutdlgg.cpp:76
 msgid "Graphics art by "
@@ -3957,9 +3956,8 @@ msgid "Green"
 msgstr "Grün"
 
 #: ../src/generic/colrdlgg.cpp:342
-#, fuzzy
 msgid "Green:"
-msgstr "Grün"
+msgstr "Grün:"
 
 #: ../src/richtext/richtextborderspage.cpp:615
 msgid "Groove"
@@ -4025,12 +4023,12 @@ msgstr "Hilfe-Bücher (*.htb)|*.htb|Hilfe-Bücher (*.zip)|*.zip|"
 #: ../src/generic/helpext.cpp:267
 #, c-format
 msgid "Help directory \"%s\" not found."
-msgstr "Hilfeverzeichnis »%s« nicht gefunden."
+msgstr "Hilfeverzeichnis „%s“ nicht gefunden."
 
 #: ../src/generic/helpext.cpp:275
 #, c-format
 msgid "Help file \"%s\" not found."
-msgstr "Hilfedatei »%s« nicht gefunden."
+msgstr "Hilfedatei „%s“ nicht gefunden."
 
 #: ../src/html/helpctrl.cpp:63
 #, c-format
@@ -4090,7 +4088,7 @@ msgstr "ICO: Fehler beim Lesen der DIB-Maske."
 #: ../src/common/imagbmp.cpp:1493 ../src/common/imagbmp.cpp:1507
 #: ../src/common/imagbmp.cpp:1518
 msgid "ICO: Error writing the image file!"
-msgstr "ICO: Schreibfehler beim Speichern."
+msgstr "ICO: Schreibfehler beim Speichern!"
 
 #: ../src/common/imagbmp.cpp:1255
 msgid "ICO: Image too tall for an icon."
@@ -4147,7 +4145,7 @@ msgid ""
 "at all possible please do continue with the report generation.\n"
 msgstr ""
 "Falls Sie diesen Fehlerbericht vollständig unterdrücken möchten, drücken Sie "
-"bitte »Abbrechen«.\n"
+"bitte „Abbrechen“.\n"
 "Bedenken Sie aber bitte, dass dies eventuell die Verbesserung des Programms "
 "behindern kann,\n"
 "nach Möglichkeit sollten Sie also den Fehlerbericht erstellen.\n"
@@ -4155,7 +4153,7 @@ msgstr ""
 #: ../src/msw/registry.cpp:1405
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
-msgstr "Ignoriere Wert »%s« des Schlüssels »%s«."
+msgstr "Ignoriere Wert „%s“ des Schlüssels „%s“."
 
 #: ../src/common/xtistrm.cpp:295
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
@@ -4196,8 +4194,8 @@ msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr ""
-"Versuch eine »rich edit control« zu erstellen fehlgeschlagen, verwende "
-"stattdessen ein einfaches Text-Control. Bitte »riched32.dll« neu installieren"
+"Versuch eine „rich edit control“ zu erstellen fehlgeschlagen, verwende "
+"stattdessen ein einfaches Text-Control. Bitte „riched32.dll“ neu installieren"
 
 #: ../src/unix/utilsunx.cpp:301
 msgid "Impossible to get child process input"
@@ -4206,17 +4204,17 @@ msgstr "Es war nicht möglich, die Eingabe des Unterprozesses zu verarbeiten"
 #: ../src/common/filefn.cpp:1028
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "Konnte die Zugriffsrechte der Datei »%s« nicht ermitteln"
+msgstr "Konnte die Zugriffsrechte der Datei „%s“ nicht ermitteln"
 
 #: ../src/common/filefn.cpp:1042
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
-msgstr "Versuch die Datei »%s« zu überschreiben, fehlgeschlagen"
+msgstr "Versuch die Datei „%s“ zu überschreiben, fehlgeschlagen"
 
 #: ../src/common/filefn.cpp:1097
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "Konnte die Zugriffsrechte für Datei »%s« nicht setzen"
+msgstr "Konnte die Zugriffsrechte für Datei „%s“ nicht setzen"
 
 # Original wird verwendet
 #. TRANSLATORS: Keyword of system colour
@@ -4267,7 +4265,7 @@ msgstr "Info"
 
 #: ../src/common/init.cpp:287
 msgid "Initialization failed in post init, aborting."
-msgstr "Initialisierung in »post init« fehlgeschlagen, breche ab."
+msgstr "Initialisierung in „post init“ fehlgeschlagen, breche ab."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:54
@@ -4311,7 +4309,7 @@ msgstr "Einfügen"
 #: ../src/gtk/app.cpp:425
 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
-msgstr "Ungültige GTK+ Kommentarzeile, benutzen Sie »%s --help«"
+msgstr "Ungültige GTK+ Kommentarzeile, benutzen Sie „%s --help“"
 
 #: ../src/common/imagtiff.cpp:311
 msgid "Invalid TIFF image index."
@@ -4320,22 +4318,22 @@ msgstr "Ungültiger Index des TIFF-Bilds."
 #: ../src/common/appcmn.cpp:273
 #, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "Ungültige Angabe »%s« des Displays."
+msgstr "Ungültige Angabe „%s“ des Displays."
 
 #: ../src/x11/app.cpp:127
 #, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "Ungültige Angabe »%s« der Fenstergröße"
+msgstr "Ungültige Angabe „%s“ der Fenstergröße"
 
 #: ../src/unix/fswatcher_inotify.cpp:323
 #, c-format
 msgid "Invalid inotify event for \"%s\""
-msgstr "Ungültiges inotify-Ereignis für »%s«"
+msgstr "Ungültiges inotify-Ereignis für „%s“"
 
 #: ../src/unix/snglinst.cpp:312
 #, c-format
 msgid "Invalid lock file '%s'."
-msgstr "Ungültige Sperr-Datei »%s«."
+msgstr "Ungültige Sperr-Datei „%s“."
 
 #: ../src/common/translation.cpp:1125
 msgid "Invalid message catalog."
@@ -4352,13 +4350,13 @@ msgstr "Ungültige oder Null-Objekt-ID an HasObjectClassInfo übergeben"
 #: ../src/common/regex.cpp:310
 #, c-format
 msgid "Invalid regular expression '%s': %s"
-msgstr "Ungültiger regulärer Ausdruck »%s«: %s"
+msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
 
 #: ../src/common/config.cpp:226
 #, c-format
 msgid "Invalid value %ld for a boolean key \"%s\" in config file."
 msgstr ""
-"Ungültiger Wert %ld für einen booleschen Schlüssel »%s« in der "
+"Ungültiger Wert %ld für einen booleschen Schlüssel „%s“ in der "
 "Konfigurationsdatei."
 
 #: ../src/generic/fontdlgg.cpp:329 ../src/richtext/richtextfontpage.cpp:351
@@ -4368,7 +4366,7 @@ msgstr "Kursiv"
 
 #: ../src/common/paper.cpp:130
 msgid "Italy Envelope, 110 x 230 mm"
-msgstr "Italy Umschlag, 110 x 230 mm"
+msgstr "Italy Umschlag, 110 × 230 mm"
 
 #: ../src/common/imagjpeg.cpp:270
 msgid "JPEG: Couldn't load - file is probably corrupted."
@@ -4380,7 +4378,7 @@ msgstr "JPEG: Konnte Bild nicht speichern."
 
 #: ../src/common/paper.cpp:163
 msgid "Japanese Double Postcard 200 x 148 mm"
-msgstr "Japanische Doppelte Postkarte 200 x 148 mm"
+msgstr "Japanische Doppelte Postkarte 200 × 148 mm"
 
 #: ../src/common/paper.cpp:167
 msgid "Japanese Envelope Chou #3"
@@ -4424,11 +4422,11 @@ msgstr "Japanischer Briefumschlag You #4 Rotiert"
 
 #: ../src/common/paper.cpp:138
 msgid "Japanese Postcard 100 x 148 mm"
-msgstr "Japanische Postkarte 100 x 148 mm"
+msgstr "Japanische Postkarte 100 × 148 mm"
 
 #: ../src/common/paper.cpp:175
 msgid "Japanese Postcard Rotated 148 x 100 mm"
-msgstr "Japanische Postkarte Rotiert 100 x 148 mm"
+msgstr "Japanische Postkarte Rotiert 100 × 148 mm"
 
 #: ../src/common/stockitem.cpp:169
 msgid "Jump to"
@@ -4443,7 +4441,7 @@ msgstr "Blocksatz"
 #: ../src/richtext/richtextliststylepage.cpp:344
 #: ../src/richtext/richtextliststylepage.cpp:346
 msgid "Justify text left and right."
-msgstr "Text rechts und links ausrichten"
+msgstr "Text rechts und links ausrichten."
 
 #: ../src/common/fmapbase.cpp:163
 msgid "KOI8-R"
@@ -4593,13 +4591,13 @@ msgstr "Letzte Seite"
 msgid "Last repeated message (\"%s\", %u time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %u times) wasn't output"
 msgstr[0] ""
-"Die letzte wiederholte Nachricht (»%s«, %u Mal) wurde nicht ausgegeben"
+"Die letzte wiederholte Nachricht („%s“, %u Mal) wurde nicht ausgegeben"
 msgstr[1] ""
-"Die letzte wiederholte Nachricht (»%s«, %u Mal) wurde nicht ausgegeben"
+"Die letzte wiederholte Nachricht („%s“, %u Mal) wurde nicht ausgegeben"
 
 #: ../src/common/paper.cpp:103
 msgid "Ledger, 17 x 11 in"
-msgstr "Ledger, 17 x 11 Zoll"
+msgstr "Ledger, 17 × 11 Zoll"
 
 #. TRANSLATORS: Keystroke for manipulating a tree control
 #. TRANSLATORS: Name of keyboard key
@@ -4637,39 +4635,39 @@ msgstr "Linksbündiger Text."
 
 #: ../src/common/paper.cpp:144
 msgid "Legal Extra 9 1/2 x 15 in"
-msgstr "Legal Extra 9 1/2 x 15 Zoll"
+msgstr "Legal Extra 9 1/2 × 15 Zoll"
 
 #: ../src/common/paper.cpp:96
 msgid "Legal, 8 1/2 x 14 in"
-msgstr "Legal, 8 1/2 x 14 Zoll"
+msgstr "Legal, 8 1/2 × 14 Zoll"
 
 #: ../src/common/paper.cpp:143
 msgid "Letter Extra 9 1/2 x 12 in"
-msgstr "Letter Extra 9 1/2 x 12 Zoll"
+msgstr "Letter Extra 9 1/2 × 12 Zoll"
 
 #: ../src/common/paper.cpp:149
 msgid "Letter Extra Transverse 9.275 x 12 in"
-msgstr "Brief Extra Quer 9.275 x 12 Zoll"
+msgstr "Brief Extra Quer 9.275 × 12 Zoll"
 
 #: ../src/common/paper.cpp:152
 msgid "Letter Plus 8 1/2 x 12.69 in"
-msgstr "Brief Plus 8 1/2 x 12.69 Zoll"
+msgstr "Brief Plus 8 1/2 × 12.69 Zoll"
 
 #: ../src/common/paper.cpp:169
 msgid "Letter Rotated 11 x 8 1/2 in"
-msgstr "Brief Rotiert 11 x 8 1/2 Zoll"
+msgstr "Brief Rotiert 11 × 8 1/2 Zoll"
 
 #: ../src/common/paper.cpp:101
 msgid "Letter Small, 8 1/2 x 11 in"
-msgstr "Letter Small, 8 1/2 x 11 Zoll"
+msgstr "Letter Small, 8 1/2 × 11 Zoll"
 
 #: ../src/common/paper.cpp:147
 msgid "Letter Transverse 8 1/2 x 11 in"
-msgstr "Brief Quer 8 1/2 x 11 Zoll"
+msgstr "Brief Quer 8 1/2 × 11 Zoll"
 
 #: ../src/common/paper.cpp:95
 msgid "Letter, 8 1/2 x 11 in"
-msgstr "Letter, 8 1/2 x 11 Zoll"
+msgstr "Letter, 8 1/2 × 11 Zoll"
 
 #: ../src/generic/aboutdlgg.cpp:173
 msgid "License"
@@ -4686,7 +4684,7 @@ msgstr "Zitronengrün"
 #: ../src/generic/helpext.cpp:294
 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
-msgstr "Zeile %lu der Abbildungsdatei »%s« hat ungültige Syntax, übersprungen."
+msgstr "Zeile %lu der Abbildungsdatei „%s“ hat ungültige Syntax, übersprungen."
 
 #: ../src/richtext/richtextliststylepage.cpp:444
 msgid "Line spacing:"
@@ -4694,7 +4692,7 @@ msgstr "Zeilenabstand:"
 
 #: ../src/html/chm.cpp:838
 msgid "Link contained '//', converted to absolute link."
-msgstr "Verweis enthielt »//«, in absoluten Link umgewandelt."
+msgstr "Verweis enthielt „//“, in absoluten Link umgewandelt."
 
 #: ../src/richtext/richtextformatdlg.cpp:364
 msgid "List Style"
@@ -4726,17 +4724,17 @@ msgstr "Laden: "
 #: ../src/unix/snglinst.cpp:246
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
-msgstr "Sperr-Datei »%s« hat falschen Besitzer."
+msgstr "Sperr-Datei „%s“ hat falschen Besitzer."
 
 #: ../src/unix/snglinst.cpp:251
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
-msgstr "Sperr-Datei »%s« hat falsche Zugriffsrechte."
+msgstr "Sperr-Datei „%s“ hat falsche Zugriffsrechte."
 
 #: ../src/generic/logg.cpp:576
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "Logtext in Datei »%s« gespeichert."
+msgstr "Logtext in Datei „%s“ gespeichert."
 
 #: ../src/richtext/richtextliststylepage.cpp:484
 #: ../src/richtext/richtextbulletspage.cpp:276
@@ -4963,7 +4961,7 @@ msgstr "Medienwiedergabe-Fehler: %s"
 #: ../src/common/fs_mem.cpp:175
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "VFS-Speicher beinhaltet bereits die Datei »%s«!"
+msgstr "VFS-Speicher beinhaltet bereits die Datei „%s“!"
 
 #. TRANSLATORS: Name of keyboard key
 #. TRANSLATORS: Keyword of system colour
@@ -5015,11 +5013,11 @@ msgstr "Geändert"
 #: ../src/common/module.cpp:133
 #, c-format
 msgid "Module \"%s\" initialization failed"
-msgstr "Initialisierung von Modul »%s« fehlgeschlagen."
+msgstr "Initialisierung von Modul „%s“ fehlgeschlagen"
 
 #: ../src/common/paper.cpp:131
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
-msgstr "Monarch Envelope, 3 7/8 x 7 1/2 Zoll"
+msgstr "Monarch Envelope, 3 7/8 × 7 1/2 Zoll"
 
 #: ../src/msw/fswatcher.cpp:143
 msgid "Monitoring individual files for changes is not supported currently."
@@ -5095,7 +5093,7 @@ msgstr "Neuer Stil"
 
 #: ../src/generic/editlbox.cpp:169
 msgid "New item"
-msgstr "Neues &Element"
+msgstr "Neues Element"
 
 #: ../src/generic/dirdlgg.cpp:297 ../src/generic/dirdlgg.cpp:307
 #: ../src/generic/filectrlg.cpp:618 ../src/generic/filectrlg.cpp:627
@@ -5104,7 +5102,7 @@ msgstr "NeuerName"
 
 #: ../src/common/prntbase.cpp:1567 ../src/html/helpwnd.cpp:665
 msgid "Next page"
-msgstr "Nächste HTML-Seite zeigen"
+msgstr "Nächste Seite"
 
 #: ../include/wx/msgdlg.h:277 ../src/common/stockitem.cpp:177
 #: ../src/motif/msgdlg.cpp:196
@@ -5142,8 +5140,8 @@ msgid ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""
-"Keine Schriftart für die Kodierung »%s« gefunden,\n"
-"es ist aber eine Alternativkodierung »%s« verfügbar.\n"
+"Keine Schriftart für die Kodierung „%s“ gefunden,\n"
+"es ist aber eine Alternativkodierung „%s“ verfügbar.\n"
 "Möchten Sie diese Kodierung wählen\n"
 "(sonst müssen Sie eine andere auswählen)?"
 
@@ -5154,7 +5152,7 @@ msgid ""
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
-"Keine Schriftart für die Kodierung »%s« gefunden,\n"
+"Keine Schriftart für die Kodierung „%s“ gefunden,\n"
 "Möchten Sie eine Schriftart für die Kodierung wählen\n"
 "(sonst wird der Text mit dieser Kodierung nicht richtig dargestellt)?"
 
@@ -5196,7 +5194,7 @@ msgstr "Keine unbenutzte Farbe im Bild."
 #: ../src/generic/helpext.cpp:302
 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
-msgstr "Keine gültige Abbildung in der Datei »%s« gefunden."
+msgstr "Keine gültige Abbildung in der Datei „%s“ gefunden."
 
 #: ../src/richtext/richtextborderspage.cpp:610
 #: ../src/richtext/richtextsizepage.cpp:248
@@ -5214,7 +5212,7 @@ msgstr "Normal"
 
 #: ../src/html/helpwnd.cpp:1263
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr "Normaler Zeichensatz<br>und <u>unterstrichen</u>. "
+msgstr "Normale Schrift<br>und <u>unterstrichen</u>. "
 
 #: ../src/html/helpwnd.cpp:1205
 msgid "Normal font:"
@@ -5235,7 +5233,7 @@ msgstr "Nicht unterstrichen"
 
 #: ../src/common/paper.cpp:115
 msgid "Note, 8 1/2 x 11 in"
-msgstr "Note, 8 1/2 x 11 Zoll"
+msgstr "Note, 8 1/2 × 11 Zoll"
 
 #: ../src/generic/notifmsgg.cpp:132
 msgid "Notice"
@@ -5384,7 +5382,7 @@ msgstr "Objekt-Umsetzung unterstützt keine benannten Argumente."
 
 #: ../src/common/xtixml.cpp:264
 msgid "Objects must have an id attribute"
-msgstr "Objekte müssen ein ID-Attribut besitzen."
+msgstr "Objekte müssen ein ID-Attribut besitzen"
 
 #: ../src/propgrid/advprops.cpp:1601
 msgid "Olive"
@@ -5395,9 +5393,8 @@ msgid "Opaci&ty:"
 msgstr "Deckkraf&t:"
 
 #: ../src/generic/colrdlgg.cpp:354
-#, fuzzy
 msgid "Opacity:"
-msgstr "Deckkraf&t:"
+msgstr "Deckkraft:"
 
 #: ../src/common/docview.cpp:1773 ../src/common/docview.cpp:1815
 msgid "Open File"
@@ -5410,16 +5407,15 @@ msgstr "Öffne HTML-Dokument"
 #: ../src/generic/dbgrptg.cpp:163
 #, c-format
 msgid "Open file \"%s\""
-msgstr "Öffne Datei »%s«"
+msgstr "Öffne Datei „%s“"
 
 #: ../src/common/stockitem.cpp:179
 msgid "Open..."
 msgstr "Öffnen …"
 
 #: ../src/unix/glx11.cpp:506 ../src/msw/glcanvas.cpp:592
-#, fuzzy
 msgid "OpenGL 3.0 or later is not supported by the OpenGL driver."
-msgstr "Kern-OpenGL-Profil wird vom OpenGL-Treiber nicht unterstützt."
+msgstr "OpenGL 3.0 und neuer, wird vom OpenGL-Treiber nicht unterstützt."
 
 #: ../src/generic/dirctrlg.cpp:599 ../src/generic/dirdlgg.cpp:323
 #: ../src/generic/filectrlg.cpp:642 ../src/generic/filectrlg.cpp:786
@@ -5429,17 +5425,17 @@ msgstr "Ausführung nicht erlaubt."
 #: ../src/common/cmdline.cpp:900
 #, c-format
 msgid "Option '%s' can't be negated"
-msgstr "Option »%s« konnte nicht negiert werden"
+msgstr "Option „%s“ konnte nicht negiert werden"
 
 #: ../src/common/cmdline.cpp:1064
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "Option »%s« erwartet einen Wert."
+msgstr "Option „%s“ erwartet einen Wert."
 
 #: ../src/common/cmdline.cpp:1147
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
-msgstr "Option »%s«: »%s« kann nicht in ein Datum umgewandelt werden."
+msgstr "Option „%s“: „%s“ kann nicht in ein Datum umgewandelt werden."
 
 #: ../src/generic/prntdlgg.cpp:618
 msgid "Options"
@@ -5509,7 +5505,7 @@ msgstr "PNM: Datei wurde abgeschnitten."
 
 #: ../src/common/paper.cpp:187
 msgid "PRC 16K 146 x 215 mm"
-msgstr "PRC 16K 146 x 215 mm"
+msgstr "PRC 16K 146 × 215 mm"
 
 #: ../src/common/paper.cpp:200
 msgid "PRC 16K Rotated"
@@ -5517,7 +5513,7 @@ msgstr "PRC 16K Rotiert"
 
 #: ../src/common/paper.cpp:188
 msgid "PRC 32K 97 x 151 mm"
-msgstr "PRC 32K 97 x 151 mm"
+msgstr "PRC 32K 97 × 151 mm"
 
 #: ../src/common/paper.cpp:201
 msgid "PRC 32K Rotated"
@@ -5525,7 +5521,7 @@ msgstr "PRC 32K Rotiert"
 
 #: ../src/common/paper.cpp:189
 msgid "PRC 32K(Big) 97 x 151 mm"
-msgstr "PRC 32K(Groß) 97 x 151 mm"
+msgstr "PRC 32K(Groß) 97 × 151 mm"
 
 #: ../src/common/paper.cpp:202
 msgid "PRC 32K(Big) Rotated"
@@ -5533,83 +5529,83 @@ msgstr "PRC 32K(Groß) Rotiert"
 
 #: ../src/common/paper.cpp:190
 msgid "PRC Envelope #1 102 x 165 mm"
-msgstr "PRC Umschlag #1 102 x 165 mm"
+msgstr "PRC Umschlag #1 102 × 165 mm"
 
 #: ../src/common/paper.cpp:203
 msgid "PRC Envelope #1 Rotated 165 x 102 mm"
-msgstr "PRC Umschlag #1 Rotated 165 x 102 mm"
+msgstr "PRC Umschlag #1 Rotated 165 × 102 mm"
 
 #: ../src/common/paper.cpp:199
 msgid "PRC Envelope #10 324 x 458 mm"
-msgstr "PRC Umschlag #10 324 x 458 mm"
+msgstr "PRC Umschlag #10 324 × 458 mm"
 
 #: ../src/common/paper.cpp:212
 msgid "PRC Envelope #10 Rotated 458 x 324 mm"
-msgstr "PRC Umschlag #10 Rotiert 458 x 324 mm"
+msgstr "PRC Umschlag #10 Rotiert 458 × 324 mm"
 
 #: ../src/common/paper.cpp:191
 msgid "PRC Envelope #2 102 x 176 mm"
-msgstr "PRC Umschlag #2 102 x 176 mm"
+msgstr "PRC Umschlag #2 102 × 176 mm"
 
 #: ../src/common/paper.cpp:204
 msgid "PRC Envelope #2 Rotated 176 x 102 mm"
-msgstr "PRC Umschlag #2 Rotiert 176 x 102 mm"
+msgstr "PRC Umschlag #2 Rotiert 176 × 102 mm"
 
 #: ../src/common/paper.cpp:192
 msgid "PRC Envelope #3 125 x 176 mm"
-msgstr "PRC Umschlag #3 125 x 176 mm"
+msgstr "PRC Umschlag #3 125 × 176 mm"
 
 #: ../src/common/paper.cpp:205
 msgid "PRC Envelope #3 Rotated 176 x 125 mm"
-msgstr "PRC Umschlag #3 Rotiert 176 x 125 mm"
+msgstr "PRC Umschlag #3 Rotiert 176 × 125 mm"
 
 #: ../src/common/paper.cpp:193
 msgid "PRC Envelope #4 110 x 208 mm"
-msgstr "PRC Umschlag #4 110 x 208 mm"
+msgstr "PRC Umschlag #4 110 × 208 mm"
 
 #: ../src/common/paper.cpp:206
 msgid "PRC Envelope #4 Rotated 208 x 110 mm"
-msgstr "PRC Umschlag #4 Rotiert 208 x 110 mm"
+msgstr "PRC Umschlag #4 Rotiert 208 × 110 mm"
 
 #: ../src/common/paper.cpp:194
 msgid "PRC Envelope #5 110 x 220 mm"
-msgstr "PRC Umschlag #5 110 x 220 mm"
+msgstr "PRC Umschlag #5 110 × 220 mm"
 
 #: ../src/common/paper.cpp:207
 msgid "PRC Envelope #5 Rotated 220 x 110 mm"
-msgstr "PRC Umschlag #5 Rotiert 220 x 110 mm"
+msgstr "PRC Umschlag #5 Rotiert 220 × 110 mm"
 
 #: ../src/common/paper.cpp:195
 msgid "PRC Envelope #6 120 x 230 mm"
-msgstr "PRC Umschlag #6 120 x 230 mm"
+msgstr "PRC Umschlag #6 120 × 230 mm"
 
 #: ../src/common/paper.cpp:208
 msgid "PRC Envelope #6 Rotated 230 x 120 mm"
-msgstr "PRC Umschlag #6 Rotiert 230 x 120 mm"
+msgstr "PRC Umschlag #6 Rotiert 230 × 120 mm"
 
 #: ../src/common/paper.cpp:196
 msgid "PRC Envelope #7 160 x 230 mm"
-msgstr "PRC Umschlag #7 160 x 230 mm"
+msgstr "PRC Umschlag #7 160 × 230 mm"
 
 #: ../src/common/paper.cpp:209
 msgid "PRC Envelope #7 Rotated 230 x 160 mm"
-msgstr "PRC Umschlag #7 Rotiert 230 x 160 mm"
+msgstr "PRC Umschlag #7 Rotiert 230 × 160 mm"
 
 #: ../src/common/paper.cpp:197
 msgid "PRC Envelope #8 120 x 309 mm"
-msgstr "PRC Umschlag #8 120 x 309 mm"
+msgstr "PRC Umschlag #8 120 × 309 mm"
 
 #: ../src/common/paper.cpp:210
 msgid "PRC Envelope #8 Rotated 309 x 120 mm"
-msgstr "PRC Umschlag #8 Rotiert 309 x 120 mm"
+msgstr "PRC Umschlag #8 Rotiert 309 × 120 mm"
 
 #: ../src/common/paper.cpp:198
 msgid "PRC Envelope #9 229 x 324 mm"
-msgstr "PRC Umschlag #9 229 x 324 mm"
+msgstr "PRC Umschlag #9 229 × 324 mm"
 
 #: ../src/common/paper.cpp:211
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
-msgstr "PRC Umschlag #9 Rotiert 324 x 229 mm"
+msgstr "PRC Umschlag #9 Rotiert 324 × 229 mm"
 
 #: ../src/richtext/richtextmarginspage.cpp:285
 msgid "Padding"
@@ -5923,7 +5919,7 @@ msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr ""
 "Bearbeitung des Fehlerberichts fehlgeschlagen, belasse die Dateien im Ordner "
-"»%s«."
+"„%s“."
 
 #: ../src/common/prntbase.cpp:545
 msgid "Progress:"
@@ -5948,7 +5944,7 @@ msgstr "Violett"
 
 #: ../src/common/paper.cpp:112
 msgid "Quarto, 215 x 275 mm"
-msgstr "Quarto, 215 x 275 mm"
+msgstr "Quarto, 215 × 275 mm"
 
 #: ../src/generic/logg.cpp:1016
 msgid "Question"
@@ -5979,12 +5975,12 @@ msgstr "RawCtrl+"
 #: ../src/common/ffile.cpp:109 ../src/common/ffile.cpp:133
 #, c-format
 msgid "Read error on file '%s'"
-msgstr "Lesefehler in Datei »%s«"
+msgstr "Lesefehler in Datei „%s“"
 
 #: ../src/common/secretstore.cpp:199
-#, fuzzy, c-format
+#, c-format
 msgid "Reading password for \"%s/%s\" failed: %s."
-msgstr "Erstellung von %s »%s« fehlgeschlagen."
+msgstr "Lesen des Passwortes für „%s/%s“ fehlgeschlagen: %s."
 
 #: ../src/common/prntbase.cpp:272
 msgid "Ready"
@@ -5996,7 +5992,7 @@ msgstr "Rot"
 
 #: ../src/generic/colrdlgg.cpp:339
 msgid "Red:"
-msgstr ""
+msgstr "Rot:"
 
 #: ../src/common/stockitem.cpp:185 ../src/stc/stc_i18n.cpp:16
 msgid "Redo"
@@ -6013,13 +6009,13 @@ msgstr "Aktualisiere"
 #: ../src/msw/registry.cpp:626
 #, c-format
 msgid "Registry key '%s' already exists."
-msgstr "Registrierungsschlüssel »%s« bereits vorhanden."
+msgstr "Registrierungsschlüssel „%s“ bereits vorhanden."
 
 #: ../src/msw/registry.cpp:595
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr ""
-"Registrierungsschlüssel »%s« existiert nicht, Umbenennung daher nicht "
+"Registrierungsschlüssel „%s“ existiert nicht, Umbenennung daher nicht "
 "möglich."
 
 #: ../src/msw/registry.cpp:727
@@ -6029,29 +6025,29 @@ msgid ""
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""
-"Registrierungsschlüssel »%s« wird vom System benötigt,\n"
+"Registrierungsschlüssel „%s“ wird vom System benötigt,\n"
 "durch seine Entfernung wird das System unbrauchbar:\n"
 "Abbruch."
 
 #: ../src/msw/registry.cpp:954
 #, c-format
 msgid "Registry value \"%s\" is not binary (but of type %s)"
-msgstr ""
+msgstr "Registrierungswert „%s“ ist nicht binär (ist aber von der Art %s)"
 
 #: ../src/msw/registry.cpp:917
 #, c-format
 msgid "Registry value \"%s\" is not numeric (but of type %s)"
-msgstr ""
+msgstr "Registrierungswert „%s“ ist nicht numerisch (ist aber von der Art %s)"
 
 #: ../src/msw/registry.cpp:1003
 #, c-format
 msgid "Registry value \"%s\" is not text (but of type %s)"
-msgstr ""
+msgstr "Registrierungswert „%s“ ist kein Text (ist aber von der Art %s)"
 
 #: ../src/msw/registry.cpp:521
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "Registrierungswert »%s« bereits vorhanden."
+msgstr "Registrierungswert „%s“ bereits vorhanden."
 
 #: ../src/richtext/richtextfontpage.cpp:350
 #: ../src/richtext/richtextfontpage.cpp:354
@@ -6080,13 +6076,13 @@ msgstr "Gliederungspunkt entfernen"
 
 #: ../src/html/helpwnd.cpp:433
 msgid "Remove current page from bookmarks"
-msgstr "Aktuelle HTML-Seite aus Lesezeichen entfernen"
+msgstr "Aktuelle Seite aus Lesezeichen entfernen"
 
 #: ../src/common/rendcmn.cpp:194
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr ""
-"Renderer »%s« hat eine ungültige Version %d.%d und kann nicht geladen werden."
+"Renderer „%s“ hat eine ungültige Version %d.%d und kann nicht geladen werden."
 
 #: ../src/richtext/richtextbuffer.cpp:4527
 msgid "Renumber List"
@@ -6119,7 +6115,7 @@ msgstr "Erforderlicher Informationseintrag ist leer."
 #: ../src/common/translation.cpp:1975
 #, c-format
 msgid "Resource '%s' is not a valid message catalog."
-msgstr "Ressource »%s« ist kein gültiger Nachrichtenkatalog."
+msgstr "Ressource „%s“ ist kein gültiger Nachrichtenkatalog."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:56
@@ -6150,7 +6146,7 @@ msgstr "Rechts"
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1754
 msgid "Right Arrow"
-msgstr "→"
+msgstr "Rechts-Pfeil"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1770
@@ -6175,7 +6171,7 @@ msgstr "Roman"
 #: ../src/generic/datavgen.cpp:5916
 #, c-format
 msgid "Row %i"
-msgstr ""
+msgstr "Zeile %i"
 
 #: ../src/richtext/richtextliststylepage.cpp:299
 #: ../src/richtext/richtextbulletspage.cpp:239
@@ -6220,9 +6216,9 @@ msgid "Save log contents to file"
 msgstr "Logtexte in Datei speichern"
 
 #: ../src/common/secretstore.cpp:179
-#, fuzzy, c-format
+#, c-format
 msgid "Saving password for \"%s/%s\" failed: %s."
-msgstr "Erstellung von %s »%s« fehlgeschlagen."
+msgstr "Speichern des Passwortes für „%s/%s“ fehlgeschlagen: %s."
 
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Script"
@@ -6279,13 +6275,13 @@ msgstr "Abschnitte"
 #: ../src/common/ffile.cpp:238
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "Suchfehler in Datei »%s«"
+msgstr "Suchfehler in Datei „%s“"
 
 #: ../src/common/ffile.cpp:228
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr ""
-"Positionierungsfehler bei Datei »%s« (große Dateien werden nicht von stdio "
+"Positionierungsfehler bei Datei „%s“ (große Dateien werden nicht von stdio "
 "unterstützt)."
 
 #. TRANSLATORS: Name of keyboard key
@@ -6308,7 +6304,7 @@ msgstr "Dokument-Vorlage wählen"
 
 #: ../src/common/docview.cpp:1969
 msgid "Select a document view"
-msgstr "Dokument-Anzeige (»View«) wählen"
+msgstr "Dokument-Anzeige („View“) wählen"
 
 #: ../src/richtext/richtextfontpage.cpp:226
 #: ../src/richtext/richtextfontpage.cpp:228
@@ -6342,7 +6338,7 @@ msgstr "Trennzeichen"
 #: ../src/common/cmdline.cpp:1083
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "Trennungszeichen nach der Option »%s« erwartet."
+msgstr "Trennungszeichen nach der Option „%s“ erwartet."
 
 #: ../src/osx/menu_osx.cpp:572
 msgid "Services"
@@ -6396,7 +6392,7 @@ msgstr "Alles zeigen"
 
 #: ../src/common/stockitem.cpp:257
 msgid "Show about dialog"
-msgstr "Zeige den »Über«-Dialog"
+msgstr "Zeige den „Über“-Dialog"
 
 #: ../src/html/helpwnd.cpp:492
 msgid "Show all"
@@ -6539,7 +6535,7 @@ msgstr "Klangdaten haben ein nicht unterstütztes Format."
 #: ../src/unix/sound.cpp:477
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
-msgstr "Klangdatei »%s« besitzt ein nicht unterstütztes Format."
+msgstr "Klangdatei „%s“ besitzt ein nicht unterstütztes Format."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:67
@@ -6566,7 +6562,7 @@ msgstr "Standard"
 
 #: ../src/common/paper.cpp:104
 msgid "Statement, 5 1/2 x 8 1/2 in"
-msgstr "Statement, 5 1/2 x 8 1/2 Zoll"
+msgstr "Statement, 5 1/2 × 8 1/2 Zoll"
 
 #: ../src/richtext/richtextsizepage.cpp:518
 #: ../src/richtext/richtextsizepage.cpp:523
@@ -6588,7 +6584,7 @@ msgstr "Durchstreichen"
 #: ../src/common/colourcmn.cpp:45
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
-msgstr "String To Colour: Falsche Farbangabe »%s«"
+msgstr "String To Colour: Falsche Farbangabe „%s“"
 
 #. TRANSLATORS: Label of font style
 #: ../src/richtext/richtextformatdlg.cpp:339 ../src/propgrid/advprops.cpp:680
@@ -6618,11 +6614,11 @@ msgstr "Hochge&stellt"
 
 #: ../src/common/paper.cpp:150
 msgid "SuperA/SuperA/A4 227 x 356 mm"
-msgstr "SuperA/SuperA/A4 227 x 356 mm"
+msgstr "SuperA/SuperA/A4 227 × 356 mm"
 
 #: ../src/common/paper.cpp:151
 msgid "SuperB/SuperB/A3 305 x 487 mm"
-msgstr "SuperB/SuperB/A3 305 x 487 mm"
+msgstr "SuperB/SuperB/A3 305 × 487 mm"
 
 #: ../src/richtext/richtextfontpage.cpp:320
 msgid "Suppress hyphe&nation"
@@ -6682,11 +6678,11 @@ msgstr "Tabelleneigenschaften"
 
 #: ../src/common/paper.cpp:145
 msgid "Tabloid Extra 11.69 x 18 in"
-msgstr "Tabloid Extra 11.69 x 18 Zoll"
+msgstr "Tabloid Extra 11.69 × 18 Zoll"
 
 #: ../src/common/paper.cpp:102
 msgid "Tabloid, 11 x 17 in"
-msgstr "Tabloid, 11 x 17 Zoll"
+msgstr "Tabloid, 11 × 17 Zoll"
 
 #: ../src/richtext/richtextformatdlg.cpp:354
 msgid "Tabs"
@@ -6793,14 +6789,14 @@ msgid ""
 "another charset to replace it with or choose\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""
-"Die Zeichensatz »%s« ist nicht bekannt. Wählen Sie \n"
-"einen Ersatzzeichensatz oder »Abbrechen«, \n"
-"falls er nicht ersetzt werden kann."
+"Die Zeichensatz „%s“ ist nicht bekannt. Wählen Sie \n"
+"einen Ersatzzeichensatz oder „Abbrechen“, \n"
+"falls er nicht ersetzt werden kann"
 
 #: ../src/msw/ole/dataobj.cpp:394
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "Das Format »%d« für die Zwischenablage existiert nicht."
+msgstr "Das Format „%d“ für die Zwischenablage existiert nicht."
 
 #: ../src/richtext/richtextstylepage.cpp:130
 #: ../src/richtext/richtextstylepage.cpp:132
@@ -6813,7 +6809,7 @@ msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
-"Verzeichnis »%s« existiert nicht.\n"
+"Verzeichnis „%s“ existiert nicht.\n"
 "Soll es jetzt erstellt werden?"
 
 #: ../src/html/htmprint.cpp:271
@@ -6824,7 +6820,7 @@ msgid ""
 "\n"
 "Would you like to proceed with printing it nevertheless?"
 msgstr ""
-"Das Dokument »%s« ist zu breit für die Seite und wird beim Drucken "
+"Das Dokument „%s“ ist zu breit für die Seite und wird beim Drucken "
 "abgeschnitten.\n"
 "\n"
 "Wollen Sie dennoch mit dem Drucken fortfahren?"
@@ -6835,7 +6831,7 @@ msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 "It has been removed from the most recently used files list."
 msgstr ""
-"Die Datei »%s« existiert nicht und konnte nicht geöffnet werden.\n"
+"Die Datei „%s“ existiert nicht und konnte nicht geöffnet werden.\n"
 "Sie wurde aus der Liste kürzlich verwendeter Dateien entfernt."
 
 #: ../src/richtext/richtextindentspage.cpp:208
@@ -6888,7 +6884,7 @@ msgstr "Die Schriftdicke."
 #: ../src/common/docview.cpp:1483
 #, c-format
 msgid "The format of file '%s' couldn't be determined."
-msgstr "Das Format der Datei »%s« konnte nicht bestimmt werden."
+msgstr "Das Format der Datei „%s“ konnte nicht bestimmt werden."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:219
 #: ../src/richtext/richtextbackgroundpage.cpp:221
@@ -6929,7 +6925,7 @@ msgstr "Der Zeilenabstand."
 #: ../src/richtext/richtextbulletspage.cpp:255
 #: ../src/richtext/richtextbulletspage.cpp:257
 msgid "The list item number."
-msgstr "Die Nummer des Listenelements"
+msgstr "Die Nummer des Listenelements."
 
 #: ../src/msw/ole/automtn.cpp:664
 msgid "The locale ID is unknown."
@@ -7000,7 +6996,7 @@ msgstr ""
 #: ../src/common/cmdline.cpp:1254
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "Der benötigte Parameter »%s« wurde nicht angegeben."
+msgstr "Der benötigte Parameter „%s“ wurde nicht angegeben."
 
 #: ../src/richtext/richtextindentspage.cpp:217
 #: ../src/richtext/richtextindentspage.cpp:219
@@ -7111,7 +7107,7 @@ msgstr "Abstand nach oben."
 #: ../src/common/cmdline.cpp:1232
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "Der Wert für die Option »%s« muss angegeben werden."
+msgstr "Der Wert für die Option „%s“ muss angegeben werden."
 
 #: ../src/richtext/richtextborderspage.cpp:585
 #: ../src/richtext/richtextborderspage.cpp:587
@@ -7189,7 +7185,7 @@ msgstr ""
 
 #: ../src/unix/threadpsx.cpp:1043
 msgid "Thread priority setting is ignored."
-msgstr "Thread-Prioritätseinstellung wird ignoriert"
+msgstr "Thread-Prioritätseinstellung wird ignoriert."
 
 #: ../src/msw/mdi.cpp:176
 msgid "Tile &Horizontally"
@@ -7211,7 +7207,7 @@ msgstr "Tipp des Tages"
 
 #: ../src/generic/tipdlg.cpp:140
 msgid "Tips not available, sorry!"
-msgstr "Bedauere, Tipps stehen nicht zur Verfügung."
+msgstr "Bedauere, Tipps stehen nicht zur Verfügung!"
 
 #: ../src/generic/prntdlgg.cpp:242
 msgid "To:"
@@ -7257,7 +7253,7 @@ msgstr "Wahr"
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr ""
-"Beim Versuch die Datei »%s« aus dem VFS-Speicher zu entfernen, wurde "
+"Beim Versuch die Datei „%s“ aus dem VFS-Speicher zu entfernen, wurde "
 "festgestellt, dass sie gar nicht geladen war!"
 
 #: ../src/common/fmapbase.cpp:156
@@ -7294,12 +7290,12 @@ msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
-"Die Typoperation »%s« ist fehlgeschlagen: Die Eigenschaft bezeichnet mit "
-"»%s« ist vom Typ »%s«, NICHT »%s«."
+"Die Typoperation „%s“ ist fehlgeschlagen: Die Eigenschaft bezeichnet mit "
+"„%s“ ist vom Typ „%s“, NICHT „%s“."
 
 #: ../src/common/paper.cpp:133
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "US Std Endlospapier, 14 7/8 x 11 Zoll"
+msgstr "US Std Endlospapier, 14 7/8 × 11 Zoll"
 
 #: ../src/common/fmapbase.cpp:196
 msgid "US-ASCII"
@@ -7319,7 +7315,7 @@ msgstr "Das Handle konnte nicht mit dem I/O-Completion-Port verknüpft werden"
 
 #: ../include/wx/msw/private/fswatcher.h:125
 msgid "Unable to close I/O completion port handle"
-msgstr "I/O-Completion-Port-Handle konnte nicht geschlossen werden."
+msgstr "I/O-Completion-Port-Handle konnte nicht geschlossen werden"
 
 #: ../src/unix/fswatcher_inotify.cpp:97
 msgid "Unable to close inotify instance"
@@ -7328,16 +7324,16 @@ msgstr "Inotify-Instanz konnte nicht geschlossen werden"
 #: ../include/wx/unix/private/fswatcher_kqueue.h:74
 #, c-format
 msgid "Unable to close path '%s'"
-msgstr "Pfad »%s« konnte nicht geschlossen werden"
+msgstr "Pfad „%s“ konnte nicht geschlossen werden"
 
 #: ../include/wx/msw/private/fswatcher.h:48
 #, c-format
 msgid "Unable to close the handle for '%s'"
-msgstr "Das Handle für »%s« konnte nicht geschlossen werden"
+msgstr "Das Handle für „%s“ konnte nicht geschlossen werden"
 
 #: ../include/wx/msw/private/fswatcher.h:273
 msgid "Unable to create I/O completion port"
-msgstr "Der I/O-Completion-Port konnte nicht erzeugt werden"
+msgstr "Der I/O-Completion-Port konnte nicht erstellt werden"
 
 #: ../src/msw/fswatcher.cpp:84
 msgid "Unable to create IOCP worker thread"
@@ -7366,7 +7362,7 @@ msgstr "Nicht möglich GTK+ zu initialisieren, ist DISPLAY korrekt gesetzt?"
 #: ../include/wx/unix/private/fswatcher_kqueue.h:57
 #, c-format
 msgid "Unable to open path '%s'"
-msgstr "Pfad »%s« lässt sich nicht öffnen"
+msgstr "Pfad „%s“ lässt sich nicht öffnen"
 
 #: ../src/html/htmlwin.cpp:583
 #, c-format
@@ -7386,18 +7382,18 @@ msgid "Unable to read from inotify descriptor"
 msgstr "Konnte nicht vom Inotify-Beschreibungselement lesen"
 
 #: ../src/unix/fswatcher_inotify.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to remove inotify watch %i"
-msgstr "Zurücksetzen der Inotify-Überwachung nicht möglich"
+msgstr "Zurücksetzen der inotify-Überwachung nicht möglich %i"
 
 #: ../src/unix/fswatcher_kqueue.cpp:153
 msgid "Unable to remove kqueue watch"
-msgstr "Zurücksetzen der Kqueue-Überwachung nicht möglich"
+msgstr "Zurücksetzen der kqueue-Überwachung nicht möglich"
 
 #: ../src/msw/fswatcher.cpp:168
 #, c-format
 msgid "Unable to set up watch for '%s'"
-msgstr "Konnte die Überwachung für »%s« nicht aufsetzen."
+msgstr "Konnte die Überwachung für „%s“ nicht aufsetzen."
 
 #: ../src/msw/fswatcher.cpp:91
 msgid "Unable to start IOCP worker thread"
@@ -7428,18 +7424,18 @@ msgstr "Letzte Aktion zurücknehmen"
 #: ../src/common/cmdline.cpp:1029
 #, c-format
 msgid "Unexpected characters following option '%s'."
-msgstr "Unerwartete Zeichen folgen der Option »%s«."
+msgstr "Unerwartete Zeichen folgen der Option „%s“."
 
 #: ../src/unix/fswatcher_inotify.cpp:274
 #, c-format
 msgid "Unexpected event for \"%s\": no matching watch descriptor."
 msgstr ""
-"Unerwartetes Ereignis für »%s«: Kein passender Überwachungs-Deskriptor."
+"Unerwartetes Ereignis für „%s“: Kein passender Überwachungs-Deskriptor."
 
 #: ../src/common/cmdline.cpp:1195
 #, c-format
 msgid "Unexpected parameter '%s'"
-msgstr "Unerwarteter Parameter »%s«"
+msgstr "Unerwarteter Parameter „%s“"
 
 #: ../include/wx/msw/private/fswatcher.h:148
 msgid "Unexpectedly new I/O completion port was created"
@@ -7529,7 +7525,7 @@ msgstr "Einheiten für die linke Randbreite."
 #: ../src/richtext/richtextmarginspage.cpp:204
 #: ../src/richtext/richtextmarginspage.cpp:206
 msgid "Units for the left margin."
-msgstr "Einheiten für den linken Rand"
+msgstr "Einheiten für den linken Rand."
 
 #: ../src/richtext/richtextborderspage.cpp:426
 #: ../src/richtext/richtextborderspage.cpp:428
@@ -7539,7 +7535,7 @@ msgstr "Einheiten für die linke Umrissbreite."
 #: ../src/richtext/richtextmarginspage.cpp:318
 #: ../src/richtext/richtextmarginspage.cpp:320
 msgid "Units for the left padding."
-msgstr "Einheiten für die linke Auffüllung"
+msgstr "Einheiten für die linke Auffüllung."
 
 #: ../src/richtext/richtextsizepage.cpp:559
 #: ../src/richtext/richtextsizepage.cpp:561
@@ -7619,7 +7615,7 @@ msgstr "Einheit für die Breite des oberen Umrisses."
 #: ../src/richtext/richtextmarginspage.cpp:366
 #: ../src/richtext/richtextmarginspage.cpp:368
 msgid "Units for the top padding."
-msgstr "Einheit für die obere Auffüllung"
+msgstr "Einheit für die obere Auffüllung."
 
 #: ../src/richtext/richtextsizepage.cpp:594
 #: ../src/richtext/richtextsizepage.cpp:596
@@ -7685,12 +7681,12 @@ msgstr "Unbekannte Ausnahme"
 
 #: ../src/common/image.cpp:2839
 msgid "Unknown image data format."
-msgstr "Unbekanntes Bilddateiformat"
+msgstr "Unbekanntes Bilddateiformat."
 
 #: ../src/common/cmdline.cpp:914
 #, c-format
 msgid "Unknown long option '%s'"
-msgstr "Unbekannte »long«-Option »%s«"
+msgstr "Unbekannte „long“-Option „%s“"
 
 #: ../src/msw/ole/automtn.cpp:631
 msgid "Unknown name or named argument."
@@ -7699,12 +7695,12 @@ msgstr "Unbekannter Name oder unbekanntes Argument."
 #: ../src/common/cmdline.cpp:929 ../src/common/cmdline.cpp:951
 #, c-format
 msgid "Unknown option '%s'"
-msgstr "Unbekannte Option »%s«"
+msgstr "Unbekannte Option „%s“"
 
 #: ../src/common/mimecmn.cpp:225
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "Unzutreffendes »{«-Zeichen in einem Eintrag des MIME-Typs %s."
+msgstr "Unzutreffendes „{“-Zeichen in einem Eintrag des MIME-Typs %s."
 
 #: ../src/common/cmdproc.cpp:262 ../src/common/cmdproc.cpp:288
 #: ../src/common/cmdproc.cpp:308
@@ -7723,7 +7719,7 @@ msgstr "Nicht unterstütztes Format in der Zwischenablage."
 #: ../src/common/appcmn.cpp:256
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "Unbekanntes Thema »%s«."
+msgstr "Unbekanntes Thema „%s“."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/generic/fdrepdlg.cpp:152 ../src/common/stockitem.cpp:205
@@ -7963,12 +7959,12 @@ msgstr "Windows_Rechts"
 #: ../src/common/ffile.cpp:150
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "Schreibfehler bei Datei »%s«"
+msgstr "Schreibfehler bei Datei „%s“"
 
 #: ../src/xml/xml.cpp:914
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "Fehler beim Lesen des XML: »%s« in Zeile %d"
+msgstr "Fehler beim Lesen des XML: „%s“ in Zeile %d"
 
 #: ../src/common/xpmdecod.cpp:796
 msgid "XPM: Malformed pixel data!"
@@ -7986,7 +7982,7 @@ msgstr "XPM: nicht korrektes Kopfformat!"
 #: ../src/common/xpmdecod.cpp:716 ../src/common/xpmdecod.cpp:725
 #, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
-msgstr "XPM: ungültige Farbdefinition »%s« in Zeile %d!"
+msgstr "XPM: ungültige Farbdefinition „%s“ in Zeile %d!"
 
 #: ../src/common/xpmdecod.cpp:755
 msgid "XPM: no colors left to use for mask!"
@@ -8050,7 +8046,7 @@ msgstr "Einpassen"
 
 #: ../src/msw/dde.cpp:1141
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "Eine DDEML-Anwendung hat eine »prolonged race condition« ausgelöst."
+msgstr "Eine DDEML-Anwendung hat eine „prolonged race condition“ ausgelöst."
 
 #: ../src/msw/dde.cpp:1129
 msgid ""
@@ -8061,7 +8057,7 @@ msgid ""
 msgstr ""
 "Eine DDEML-Funktion wurde aufgerufen, ohne vorher die Deinitialisierungs-"
 "Funktion aufzurufen,\n"
-"oder ein ungültiger »instance identifier«\n"
+"oder ein ungültiger „instance identifier“\n"
 "wurde an eine DDEML-Funktion übergeben."
 
 #: ../src/msw/dde.cpp:1147
@@ -8080,31 +8076,31 @@ msgstr "Ein Parameter wurde von DDEML nicht verifiziert."
 #: ../src/msw/dde.cpp:1120
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr ""
-"Eine Anfrage für eine »synchronous advise transaction« ist fehlgeschlagen "
+"Eine Anfrage für eine „synchronous advise transaction“ ist fehlgeschlagen "
 "(time-out)"
 
 #: ../src/msw/dde.cpp:1126
 msgid "a request for a synchronous data transaction has timed out."
 msgstr ""
-"Eine Anfrage für eine »synchronous data transaction« ist fehlgeschlagen "
+"Eine Anfrage für eine „synchronous data transaction“ ist fehlgeschlagen "
 "(time-out)"
 
 #: ../src/msw/dde.cpp:1135
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr ""
-"Eine Anfrage für eine »synchronous execute transaction« ist fehlgeschlagen "
+"Eine Anfrage für eine „synchronous execute transaction“ ist fehlgeschlagen "
 "(time-out)"
 
 #: ../src/msw/dde.cpp:1153
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr ""
-"Eine Anfrage für eine »synchronous poke transaction« ist fehlgeschlagen "
+"Eine Anfrage für eine „synchronous poke transaction“ ist fehlgeschlagen "
 "(time-out)"
 
 #: ../src/msw/dde.cpp:1168
 msgid "a request to end an advise transaction has timed out."
 msgstr ""
-"Eine Anfrage, eine »advise transaction« zu beenden ist, fehlgeschlagen (time-"
+"Eine Anfrage, eine „advise transaction“ zu beenden ist, fehlgeschlagen (time-"
 "out)"
 
 #: ../src/msw/dde.cpp:1162
@@ -8132,14 +8128,14 @@ msgid ""
 "or an application initialized as APPCMD_CLIENTONLY has \n"
 "attempted to perform server transactions."
 msgstr ""
-"Eine Anwendung, die als ein »APPCLASS_MONITOR« gestartet wurde, \n"
+"Eine Anwendung, die als ein „APPCLASS_MONITOR“ gestartet wurde, \n"
 "versuchte eine DDE-Transaktion auszuführen,\n"
-"oder eine Anwendung, die als ein »APPCMD_CLIENTONLY« gestartet wurde, \n"
+"oder eine Anwendung, die als ein „APPCMD_CLIENTONLY“ gestartet wurde, \n"
 "versuchte eine Server-Transaktion auszuführen."
 
 #: ../src/msw/dde.cpp:1156
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "Ein interner Aufruf zur »PostMessage«-Funktion ist fehlgeschlagen. "
+msgstr "Ein interner Aufruf zur „PostMessage“-Funktion ist fehlgeschlagen. "
 
 #: ../src/msw/dde.cpp:1165
 msgid "an internal error has occurred in the DDEML."
@@ -8153,7 +8149,7 @@ msgid ""
 msgstr ""
 "Eine ungültige Transaktions-Identifizierung wurde an eine DDEML-Funktion "
 "übergeben.\n"
-"Sobald die Anwendung aus einem »XTYP_XACT_COMPLETE«-Callback zurückkehrt,\n"
+"Sobald die Anwendung aus einem „XTYP_XACT_COMPLETE“-Callback zurückkehrt,\n"
 "ist die Transaktions-Identifizierung für diesen Callback nicht mehr gültig."
 
 #: ../src/common/zipstrm.cpp:1483
@@ -8164,7 +8160,7 @@ msgstr "Nehme an, dies ist ein mehrteiliges, zusammenhängendes Zip-Archiv"
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr ""
-"Versuch den unveränderlichen Schlüssel »%s« anzupassen wurde ignoriert."
+"Versuch den unveränderlichen Schlüssel „%s“ anzupassen wurde ignoriert."
 
 #: ../src/html/chm.cpp:329
 msgid "bad arguments to library function"
@@ -8176,7 +8172,7 @@ msgstr "Ungültige Unterschrift"
 
 #: ../src/common/zipstrm.cpp:1918
 msgid "bad zipfile offset to entry"
-msgstr "Ungültiges Offset zum Einsprung in der Zipdatei."
+msgstr "ungültiges Offset zum Einsprung in der Zipdatei"
 
 #: ../src/common/ftp.cpp:403
 msgid "binary"
@@ -8194,43 +8190,43 @@ msgstr "Erzeugungsversion %lu"
 #: ../src/common/ffile.cpp:75
 #, c-format
 msgid "can't close file '%s'"
-msgstr "Kann Datei »%s« nicht schließen"
+msgstr "Kann Datei „%s“ nicht schließen"
 
 #: ../src/common/file.cpp:245
 #, c-format
 msgid "can't close file descriptor %d"
-msgstr "Kann Dateibeschreibung »%d« nicht schließen"
+msgstr "Kann Dateibeschreibung „%d“ nicht schließen"
 
 #: ../src/common/file.cpp:586
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "Kann Änderungen in Datei »%s« nicht sichern"
+msgstr "Kann Änderungen in Datei „%s“ nicht sichern"
 
 #: ../src/common/file.cpp:178
 #, c-format
 msgid "can't create file '%s'"
-msgstr "Kann Datei »%s« nicht anlegen"
+msgstr "Kann Datei „%s“ nicht anlegen"
 
 #: ../src/common/fileconf.cpp:1141
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "Kann Konfigurationsdatei »%s« nicht löschen"
+msgstr "Kann Konfigurationsdatei „%s“ nicht löschen"
 
 #: ../src/common/file.cpp:495
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr ""
-"Auf Dateibeschreibung »%d« kann nicht festgestellt werden, ob das Dateiende "
+"Auf Dateibeschreibung „%d“ kann nicht festgestellt werden, ob das Dateiende "
 "erreicht ist"
 
 #: ../src/common/zipstrm.cpp:1692
 msgid "can't find central directory in zip"
-msgstr "Kann Zentralverzeichnis im Zip nicht finden."
+msgstr "kann Zentralverzeichnis im Zip nicht finden"
 
 #: ../src/common/file.cpp:465
 #, c-format
 msgid "can't find length of file on file descriptor %d"
-msgstr "Kann auf Dateibeschreibung »%d« die Dateilänge nicht finden"
+msgstr "Kann auf Dateibeschreibung „%d“ die Dateilänge nicht finden"
 
 #: ../src/msw/utils.cpp:341
 msgid "can't find user's HOME, using current directory."
@@ -8239,7 +8235,7 @@ msgstr "Kann Benutzerverzeichnis nicht finden, verwende aktuelles Verzeichnis."
 #: ../src/common/file.cpp:366
 #, c-format
 msgid "can't flush file descriptor %d"
-msgstr "Kann auf die Dateibeschreibung »%d« nicht entladen"
+msgstr "Kann auf die Dateibeschreibung „%d“ nicht entladen"
 
 #: ../src/common/file.cpp:422
 #, c-format
@@ -8253,17 +8249,17 @@ msgstr "Kann keine Schriftarten mehr laden, Abbruch"
 #: ../src/common/file.cpp:231 ../src/common/ffile.cpp:59
 #, c-format
 msgid "can't open file '%s'"
-msgstr "Kann Datei »%s« nicht öffnen"
+msgstr "Kann Datei „%s“ nicht öffnen"
 
 #: ../src/common/fileconf.cpp:320
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "Kann globale Konfigurationsdatei »%s« nicht öffnen."
+msgstr "Kann globale Konfigurationsdatei „%s“ nicht öffnen."
 
 #: ../src/common/fileconf.cpp:336
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "Kann Konfigurationsdatei »%s« nicht öffnen."
+msgstr "Kann Konfigurationsdatei „%s“ nicht öffnen."
 
 #: ../src/common/fileconf.cpp:986
 msgid "can't open user configuration file."
@@ -8280,32 +8276,32 @@ msgstr "Kann den zlib inflate-stream nicht reinitialisieren"
 #: ../src/common/file.cpp:304
 #, c-format
 msgid "can't read from file descriptor %d"
-msgstr "Kann Dateibeschreibung »%d« nicht lesen"
+msgstr "Kann Dateibeschreibung „%d“ nicht lesen"
 
 #: ../src/common/file.cpp:581
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "Kann Datei »%s« nicht löschen"
+msgstr "Kann Datei „%s“ nicht löschen"
 
 #: ../src/common/file.cpp:598
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "Kann temporäre Datei »%s« nicht löschen"
+msgstr "Kann temporäre Datei „%s“ nicht löschen"
 
 #: ../src/common/file.cpp:408
 #, c-format
 msgid "can't seek on file descriptor %d"
-msgstr "Kann auf der Dateibeschreibung »%d« nicht suchen"
+msgstr "Kann auf der Dateibeschreibung „%d“ nicht suchen"
 
 #: ../src/common/textfile.cpp:273
 #, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "Kann den Puffer »%s« nicht schreiben."
+msgstr "Kann den Puffer „%s“ nicht schreiben."
 
 #: ../src/common/file.cpp:323
 #, c-format
 msgid "can't write to file descriptor %d"
-msgstr "Kann auf Dateibeschreibung »%d« nicht schreiben"
+msgstr "Kann auf Dateibeschreibung „%d“ nicht schreiben"
 
 #: ../src/common/fileconf.cpp:1000
 msgid "can't write user configuration file."
@@ -8314,7 +8310,7 @@ msgstr "Kann Benutzer-Konfigurationsdatei nicht schreiben."
 #. TRANSLATORS: Checkbox state name
 #: ../src/generic/treelist.cpp:482 ../src/generic/datavgen.cpp:1261
 msgid "checked"
-msgstr ""
+msgstr "ausgewählt"
 
 #: ../src/html/chm.cpp:345
 msgid "checksum error"
@@ -8405,7 +8401,7 @@ msgstr "elfte"
 #: ../src/common/fileconf.cpp:1833
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
-msgstr "Eintrag »%s« erscheint in Gruppe »%s« mehrfach"
+msgstr "Eintrag „%s“ erscheint in Gruppe „%s“ mehrfach"
 
 #: ../src/html/chm.cpp:343
 msgid "error in data format"
@@ -8427,18 +8423,17 @@ msgstr "Fehler beim Lesen des lokalen Headers in Zipdatei"
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr ""
-"Fehler beim Schreiben von Zip-Eintrag »%s«: Falsche Prüfsumme oder Länge"
+"Fehler beim Schreiben von Zip-Eintrag „%s“: Falsche Prüfsumme oder Länge"
 
 #: ../src/common/ffile.cpp:188
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "Versuch, die Datei »%s« zu entladen, fehlgeschlagen"
+msgstr "Versuch, die Datei „%s“ zu entladen, fehlgeschlagen"
 
 #. TRANSLATORS: Name of Boolean false value
 #: ../src/generic/datavgen.cpp:1030
-#, fuzzy
 msgid "false"
-msgstr "Falsch"
+msgstr "falsch"
 
 #: ../src/common/datetimefmt.cpp:1966
 msgid "fifteenth"
@@ -8449,30 +8444,30 @@ msgid "fifth"
 msgstr "fünfte"
 
 #: ../src/common/fileconf.cpp:579
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: '%s' ignored after group header."
-msgstr "Datei »%s«, Zeile %d: »%s« hinter Gruppenkopf ignoriert."
+msgstr "Datei „%s“, Zeile %zu: „%s“ hinter Gruppenkopf ignoriert."
 
 #: ../src/common/fileconf.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: '=' expected."
-msgstr "Datei »%s«, Zeile %d: »=« erwartet."
+msgstr "Datei „%s“, Zeile %zu: „=“ erwartet."
 
 #: ../src/common/fileconf.cpp:631
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: key '%s' was first found at line %d."
-msgstr "Datei »%s«, Zeile %d: Eintrag »%s« taucht erstmals in Zeile %d auf."
+msgstr "Datei „%s“, Zeile %zu: Eintrag „%s“ taucht erstmals in Zeile %d auf."
 
 #: ../src/common/fileconf.cpp:621
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: value for immutable key '%s' ignored."
 msgstr ""
-"Datei »%s«, Zeile %d: Wert für nicht-änderbaren Eintrag »%s« ignoriert."
+"Datei „%s“, Zeile %zu: Wert für nicht-änderbaren Eintrag „%s“ ignoriert."
 
 #: ../src/common/fileconf.cpp:543
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s': unexpected character %c at line %zu."
-msgstr "Datei »%s«: unerwartetes Zeichen %c in Zeile %d."
+msgstr "Datei „%s“: unerwartetes Zeichen %c in Zeile %zu."
 
 #: ../src/richtext/richtextbuffer.cpp:8738
 msgid "files"
@@ -8484,7 +8479,7 @@ msgstr "erste"
 
 #: ../src/html/helpwnd.cpp:1252
 msgid "font size"
-msgstr "Schriftgröße:"
+msgstr "Schriftgröße"
 
 #: ../src/common/datetimefmt.cpp:1965
 msgid "fourteenth"
@@ -8538,7 +8533,7 @@ msgstr "dünn"
 #: ../src/common/intl.cpp:303
 #, c-format
 msgid "locale '%s' cannot be set."
-msgstr "Lokale Umgebung »%s« kann nicht gesetzt werden."
+msgstr "Lokale Umgebung „%s“ kann nicht gesetzt werden."
 
 #: ../src/common/datetimefmt.cpp:2125
 msgid "midnight"
@@ -8814,7 +8809,7 @@ msgstr "zehnte"
 
 #: ../src/msw/dde.cpp:1123
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
-msgstr "das Ergebnis zur Transaktion hat das »DDE_FBUSY«-Bit gesetzt."
+msgstr "das Ergebnis zur Transaktion hat das „DDE_FBUSY“-Bit gesetzt."
 
 #: ../src/common/datetimefmt.cpp:1954
 msgid "third"
@@ -8835,7 +8830,7 @@ msgstr "morgen"
 #: ../src/common/fileconf.cpp:1944
 #, c-format
 msgid "trailing backslash ignored in '%s'"
-msgstr "Abschließenden Gegenschrägstrich in »%s« ignoriert"
+msgstr "Abschließenden Gegenschrägstrich in „%s“ ignoriert"
 
 #: ../src/gtk/aboutdlg.cpp:218
 msgid "translator-credits"
@@ -8844,7 +8839,7 @@ msgstr "Ãœbersetzer"
 #. TRANSLATORS: Name of Boolean true value
 #: ../src/generic/datavgen.cpp:1028
 msgid "true"
-msgstr ""
+msgstr "wahr"
 
 #: ../src/common/datetimefmt.cpp:1963
 msgid "twelfth"
@@ -8857,7 +8852,7 @@ msgstr "zwanzigste"
 #. TRANSLATORS: Checkbox state name
 #: ../src/generic/treelist.cpp:486 ../src/generic/datavgen.cpp:1263
 msgid "unchecked"
-msgstr ""
+msgstr "nicht ausgewählt"
 
 #: ../src/common/fontcmn.cpp:802 ../src/common/fontcmn.cpp:978
 msgid "underlined"
@@ -8865,14 +8860,13 @@ msgstr "unterstrichen"
 
 #. TRANSLATORS: Checkbox state name
 #: ../src/generic/treelist.cpp:490
-#, fuzzy
 msgid "undetermined"
-msgstr "unterstrichen"
+msgstr "untentschieden"
 
 #: ../src/common/fileconf.cpp:1979
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
-msgstr "unerwartetes \" an Position %d in »%s«."
+msgstr "unerwartetes \" an Position %d in „%s“."
 
 #: ../src/common/tarstrm.cpp:1045
 msgid "unexpected end of file"
@@ -8884,9 +8878,9 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #: ../src/msw/registry.cpp:150
-#, fuzzy, c-format
+#, c-format
 msgid "unknown (%lu)"
-msgstr "unbekannt"
+msgstr "unbekannt (%lu)"
 
 #: ../src/common/xtixml.cpp:253
 #, c-format
@@ -8918,12 +8912,12 @@ msgstr "Unbenannt%d"
 
 #: ../src/common/zipstrm.cpp:1999 ../src/common/zipstrm.cpp:2319
 msgid "unsupported Zip compression method"
-msgstr "Nicht unterstütztes Zip-Kompressionsformat."
+msgstr "nicht unterstütztes Zip-Kompressionsformat"
 
 #: ../src/common/translation.cpp:1892
 #, c-format
 msgid "using catalog '%s' from '%s'."
-msgstr "Verwende Nachrichtenkatalog »%s« von »%s«."
+msgstr "Verwende Nachrichtenkatalog „%s“ von „%s“."
 
 #: ../src/html/chm.cpp:335
 msgid "write error"
@@ -8936,7 +8930,7 @@ msgstr "wxGetTimeOfDay fehlgeschlagen."
 #: ../src/motif/app.cpp:242
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
-msgstr "wxWidgets konnte »open display« nicht ausführen für »%s«: Abbruch."
+msgstr "wxWidgets konnte „open display“ nicht ausführen für „%s“: Abbruch."
 
 #: ../src/x11/app.cpp:170
 msgid "wxWidgets could not open display. Exiting."
diff --git a/locale/hr.po b/locale/hr.po
index 4be234004c..3a3ae530da 100644
--- a/locale/hr.po
+++ b/locale/hr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: wxWidgets 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-05-21 14:25+0200\n"
-"PO-Revision-Date: 2019-03-10 17:42+0100\n"
+"PO-Revision-Date: 2019-04-06 17:57+0200\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +49,7 @@ msgstr " (greška %ld: %s)"
 #: ../src/common/imagtiff.cpp:72
 #, c-format
 msgid " (in module \"%s\")"
-msgstr " (u modulu \"%s\")"
+msgstr " (u modulu „%s�)"
 
 #: ../src/osx/core/secretstore.cpp:138
 msgid " (while overwriting an existing item)"
@@ -169,7 +169,7 @@ msgstr "%s upozorenje"
 #: ../src/common/tarstrm.cpp:1319
 #, c-format
 msgid "%s did not fit the tar header for entry '%s'"
-msgstr "%s ne paše tar zaglavlju za unos '%s'"
+msgstr "%s ne paše tar zaglavlju za unos „%s�"
 
 #: ../src/common/fldlgcmn.cpp:124
 #, c-format
@@ -196,7 +196,7 @@ msgstr "&Nakon odlomka:"
 #: ../src/richtext/richtextindentspage.cpp:128
 #: ../src/richtext/richtextliststylepage.cpp:319
 msgid "&Alignment"
-msgstr "%Poravnanje"
+msgstr "&Poravnanje"
 
 #: ../src/common/stockitem.cpp:141
 msgid "&Apply"
@@ -228,11 +228,11 @@ msgstr "&Prije odlomka:"
 
 #: ../src/richtext/richtextfontpage.cpp:262
 msgid "&Bg colour:"
-msgstr "Boja &pozadine:"
+msgstr "&Boja pozadine:"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:298
 msgid "&Blur distance:"
-msgstr "Udaljenost &mutnoće:"
+msgstr "&Udaljenost mutnoće:"
 
 #: ../src/common/stockitem.cpp:143
 msgid "&Bold"
@@ -258,7 +258,7 @@ msgstr "&Okvir"
 #: ../src/richtext/richtextliststylepage.cpp:210
 #: ../src/richtext/richtextbulletspage.cpp:146
 msgid "&Bullet style:"
-msgstr "_Stil&Stil znaka nabrajanja:"
+msgstr "&Stil znaka nabrajanja:"
 
 #: ../src/common/stockitem.cpp:146
 msgid "&CD-Rom"
@@ -276,7 +276,7 @@ msgstr "&Kaskada"
 
 #: ../include/wx/richtext/richtextbuffer.h:5960
 msgid "&Cell"
-msgstr "&Ćelija"
+msgstr "Ć&elija"
 
 #: ../src/richtext/richtextsymboldlg.cpp:439
 msgid "&Character code:"
@@ -318,11 +318,11 @@ msgstr "&Prilagodi …"
 
 #: ../src/generic/dbgrptg.cpp:334
 msgid "&Debug report preview:"
-msgstr "Pregled izvještaja o otklanjanju grešaka:"
+msgstr "&Pregled izvještaja o otklanjanju grešaka:"
 
-#: ../src/richtext/richtexttabspage.cpp:138 ../src/richtext/richtextctrl.cpp:335
-#: ../src/osx/textctrl_osx.cpp:579 ../src/common/stockitem.cpp:152
-#: ../src/msw/textctrl.cpp:2510
+#: ../src/richtext/richtexttabspage.cpp:138
+#: ../src/richtext/richtextctrl.cpp:335 ../src/osx/textctrl_osx.cpp:579
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2510
 msgid "&Delete"
 msgstr "&Izbriši"
 
@@ -433,7 +433,7 @@ msgstr "&Vodoravni odmak:"
 #: ../src/richtext/richtextindentspage.cpp:184
 #: ../src/richtext/richtextliststylepage.cpp:372
 msgid "&Indentation (tenths of a mm)"
-msgstr "Uvlaka (u destinkama mm)"
+msgstr "&Uvlaka (u destinkama mm)"
 
 #: ../src/richtext/richtextindentspage.cpp:167
 #: ../src/richtext/richtextliststylepage.cpp:356
@@ -459,7 +459,7 @@ msgstr "&Prijeđi na"
 #: ../src/richtext/richtextindentspage.cpp:153
 #: ../src/richtext/richtextliststylepage.cpp:342
 msgid "&Justified"
-msgstr "&Poravnato"
+msgstr "&Puni format"
 
 #: ../src/common/stockitem.cpp:174
 msgid "&Last"
@@ -483,7 +483,7 @@ msgstr "&Lijevo:"
 
 #: ../src/richtext/richtextliststylepage.cpp:183
 msgid "&List level:"
-msgstr "&Prva razine:"
+msgstr "&Razina popisa:"
 
 #: ../src/generic/logg.cpp:517
 msgid "&Log"
@@ -548,7 +548,7 @@ msgstr "&Otvori …"
 
 #: ../src/richtext/richtextindentspage.cpp:222
 msgid "&Outline level:"
-msgstr "&Razina pregleda:"
+msgstr "&Razina sadržaja:"
 
 #: ../src/richtext/richtextindentspage.cpp:293
 msgid "&Page Break"
@@ -569,11 +569,11 @@ msgstr "&Veli�ina:"
 
 #: ../src/richtext/richtexttabspage.cpp:110
 msgid "&Position (tenths of a mm):"
-msgstr "&Pozicija (u desetinkama mm)"
+msgstr "&Položaj (u desetinkama mm):"
 
 #: ../src/richtext/richtextsizepage.cpp:514
 msgid "&Position mode:"
-msgstr "&Modus pozicije:"
+msgstr "&Modus položaja:"
 
 #: ../src/common/stockitem.cpp:181
 msgid "&Preferences"
@@ -652,7 +652,7 @@ msgstr "&Spremi pod"
 
 #: ../include/wx/richmsgdlg.h:29
 msgid "&See details"
-msgstr "Prikaži detalje"
+msgstr "&Prikaži detalje"
 
 #: ../src/generic/tipdlg.cpp:236
 msgid "&Show tips at startup"
@@ -677,7 +677,7 @@ msgstr "&Spacioniranje (u desetinkama mm)"
 
 #: ../src/common/stockitem.cpp:197
 msgid "&Spell Check"
-msgstr "Provjera pravopisa"
+msgstr "&Provjera pravopisa"
 
 #: ../src/common/stockitem.cpp:198
 msgid "&Stop"
@@ -773,9 +773,10 @@ msgstr "&Debljina:"
 msgid "&Width:"
 msgstr "&Å irina:"
 
-#: ../src/aui/tabmdi.cpp:311 ../src/aui/tabmdi.cpp:327 ../src/aui/tabmdi.cpp:329
-#: ../src/generic/mdig.cpp:294 ../src/generic/mdig.cpp:310
-#: ../src/generic/mdig.cpp:314 ../src/msw/mdi.cpp:78
+#: ../src/aui/tabmdi.cpp:311 ../src/aui/tabmdi.cpp:327
+#: ../src/aui/tabmdi.cpp:329 ../src/generic/mdig.cpp:294
+#: ../src/generic/mdig.cpp:310 ../src/generic/mdig.cpp:314
+#: ../src/msw/mdi.cpp:78
 msgid "&Window"
 msgstr "&Prozor"
 
@@ -786,67 +787,67 @@ msgstr "&Da"
 #: ../src/common/valtext.cpp:256
 #, c-format
 msgid "'%s' contains illegal characters"
-msgstr "'%s' sadržava nedozvoljene slovne znakove"
+msgstr "„%s� sadržava nedozvoljene slovne znakove"
 
 #: ../src/common/valtext.cpp:254
 #, c-format
 msgid "'%s' doesn't consist only of valid characters"
-msgstr "'%s' ne sadržava samo dozvoljene slovne znakove"
+msgstr "„%s� ne sadržava samo dozvoljene slovne znakove"
 
 #: ../src/common/config.cpp:519 ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
-msgstr "'%s' ima dodatne '..', zanemareno."
+msgstr "„%s� ima dodatne „..�, zanemareno."
 
 #: ../src/common/cmdline.cpp:1113 ../src/common/cmdline.cpp:1131
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
-msgstr "'%s' nije ispravna numeri�ka vrijednost za opciju '%s'."
+msgstr "„%s� nije ispravna numeri�ka vrijednost za opciju „%s�."
 
 #: ../src/common/translation.cpp:1100
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' nije valjani katalog obavijesti."
+msgstr "„%s� nije valjan katalog obavijesti."
 
 #: ../src/common/valtext.cpp:165
 #, c-format
 msgid "'%s' is not one of the valid strings"
-msgstr "'%s' nije jedan od valjanih znakovnih nizova"
+msgstr "„%s� nije jedan od valjanih znakovnih nizova"
 
 #: ../src/common/valtext.cpp:167
 #, c-format
 msgid "'%s' is one of the invalid strings"
-msgstr "'%s' je jedan od valjanih znakovnih nizova"
+msgstr "„%s� je jedan od nevaljanih znakovnih nizova"
 
 #: ../src/common/textbuf.cpp:237
 #, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "'%s' je vjerojatno jedan binarni međuspremnik."
+msgstr "„%s� je vjerojatno jedan binaran međuspremnik."
 
 #: ../src/common/valtext.cpp:252
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "'%s' treba biti numeri�ki."
+msgstr "„%s� treba biti numeri�ki."
 
 #: ../src/common/valtext.cpp:244
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "'%s' treba sadržavati samo ASCII slovne znakove."
+msgstr "„%s� treba sadržavati samo ASCII slovne znakove."
 
 #: ../src/common/valtext.cpp:246
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "'%s' treba sadržavati samo alfabetne slovne znakove."
+msgstr "„%s� treba sadržavati samo slovne znakove."
 
 #: ../src/common/valtext.cpp:248
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "'%s' treba sadržavati samo alfabetne ili numeri�ke slovne znakove."
+msgstr "„%s� treba sadržavati samo alfanumeri�ke znakove."
 
 #: ../src/common/valtext.cpp:250
 #, c-format
 msgid "'%s' should only contain digits."
-msgstr "'%s' treba sadržavati samo brojke."
+msgstr "„%s� treba sadržavati samo brojke."
 
 #: ../src/richtext/richtextliststylepage.cpp:229
 #: ../src/richtext/richtextbulletspage.cpp:166
@@ -908,7 +909,7 @@ msgstr ", 64-bitno izdanje"
 #: ../src/richtext/richtextliststylepage.cpp:493
 #: ../src/richtext/richtextbulletspage.cpp:285
 msgid "-"
-msgstr "–"
+msgstr "-"
 
 #: ../src/generic/filepickerg.cpp:66
 msgid "..."
@@ -1056,7 +1057,7 @@ msgstr "<POVEZNICA>"
 
 #: ../src/html/helpwnd.cpp:1266
 msgid "<b><i>Bold italic face.</i></b><br>"
-msgstr "<b><i>Debeli kurzivni rez.</i></b><br>"
+msgstr "<b><i>Debeli kurziv.</i></b><br>"
 
 #: ../src/html/helpwnd.cpp:1270
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
@@ -1064,11 +1065,11 @@ msgstr "<b><i>debeli kurziv <u>podcrtano</u></i></b><br>"
 
 #: ../src/html/helpwnd.cpp:1265
 msgid "<b>Bold face.</b> "
-msgstr "<b>Debeli rez.</b> "
+msgstr "<b>Debeli.</b> "
 
 #: ../src/html/helpwnd.cpp:1264
 msgid "<i>Italic face.</i> "
-msgstr "<i>Kurzivni rez.</i> "
+msgstr "<i>Kurziv.</i> "
 
 #: ../src/richtext/richtextliststylepage.cpp:494
 #: ../src/richtext/richtextbulletspage.cpp:286
@@ -1085,7 +1086,7 @@ msgstr "Izvještaj o otklanjanju grešaka je stvoren. Nalazi se u"
 
 #: ../src/common/xtixml.cpp:418
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr "Ne prazna kolekcija mora sadržavati 'element' �vorove"
+msgstr "Ne prazna kolekcija mora sadržavati „element� �vorove"
 
 #: ../src/richtext/richtextliststylepage.cpp:304
 #: ../src/richtext/richtextliststylepage.cpp:306
@@ -1204,12 +1205,12 @@ msgstr "Apsolutno"
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:873
 msgid "ActiveBorder"
-msgstr "ActiveBorder"
+msgstr "Aktivni rub"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:874
 msgid "ActiveCaption"
-msgstr "ActiveCaption"
+msgstr "Aktivni podnaslov"
 
 #: ../src/common/stockitem.cpp:207
 msgid "Actual Size"
@@ -1218,7 +1219,7 @@ msgstr "Stvarna veli�ina"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/stockitem.cpp:140 ../src/common/accelcmn.cpp:81
 msgid "Add"
-msgstr "Add"
+msgstr "Dodaj"
 
 #: ../src/richtext/richtextbuffer.cpp:11455
 msgid "Add Column"
@@ -1323,12 +1324,12 @@ msgstr "Datoteka animacije nije vrste %ld."
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:872
 msgid "AppWorkspace"
-msgstr "AppWorkspace"
+msgstr "Radna površina aplikacije"
 
 #: ../src/generic/logg.cpp:1014
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "Pridodaj log-zapis datoteci '%s' (odabirom [Ne] će biti prepisana)?"
+msgstr "Pridodaj log-zapis datoteci „%s� (odabirom [Ne] će biti prepisana)?"
 
 #: ../src/osx/menu_osx.cpp:577 ../src/osx/menu_osx.cpp:585
 msgid "Application"
@@ -1459,7 +1460,7 @@ msgstr "BMP: wxImage nema vlastitu wxPalette."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/stockitem.cpp:142 ../src/common/accelcmn.cpp:52
 msgid "Back"
-msgstr "Back"
+msgstr "Natrag"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:148
 #: ../src/richtext/richtextformatdlg.cpp:384
@@ -1477,7 +1478,7 @@ msgstr "Boja pozadine"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:52
 msgid "Backspace"
-msgstr "Backspace"
+msgstr "Brisanje"
 
 #: ../src/common/fmapbase.cpp:160
 msgid "Baltic (ISO-8859-13)"
@@ -1572,22 +1573,22 @@ msgstr "Meta"
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:875
 msgid "ButtonFace"
-msgstr "ButtonFace"
+msgstr "Ploha gumba"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:876
 msgid "ButtonHighlight"
-msgstr "ButtonHighlight"
+msgstr "Isticanje gumba"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:877
 msgid "ButtonShadow"
-msgstr "ButtonShadow"
+msgstr "Sjena gumba"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:878
 msgid "ButtonText"
-msgstr "ButtonText"
+msgstr "Tekst gumba"
 
 #: ../src/common/paper.cpp:98
 msgid "C sheet, 17 x 22 in"
@@ -1640,12 +1641,13 @@ msgstr "&Poništavanje nije moguće "
 #: ../src/common/image.cpp:2824
 msgid "Can't automatically determine the image format for non-seekable input."
 msgstr ""
-"Nije moguće automatski odrediti format slike za unos, koji se ne može tražiti."
+"Nije moguće automatski odrediti format slike za unos, koji se ne može "
+"tražiti."
 
 #: ../src/msw/registry.cpp:506
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "Nije moguće zatvoriti registarski klju� '%s'"
+msgstr "Nije moguće zatvoriti registarski klju� „%s�"
 
 #: ../src/msw/registry.cpp:584
 #, c-format
@@ -1655,7 +1657,7 @@ msgstr "Nije moguće kopirati vrijednosti nepodržane vrste %d."
 #: ../src/msw/registry.cpp:487
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "Nije moguće stvoriti registarski klju� '%s'"
+msgstr "Nije moguće stvoriti registarski klju� „%s�"
 
 #: ../src/msw/thread.cpp:665
 msgid "Can't create thread"
@@ -1669,27 +1671,27 @@ msgstr "Nije moguće stvoriti prozor vrste %s"
 #: ../src/msw/registry.cpp:777
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "Nije moguće izbrisati klju� '%s'"
+msgstr "Nije moguće izbrisati klju� „%s�"
 
 #: ../src/msw/iniconf.cpp:458
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "Nije moguće izbrisati INI datoteku '%s'"
+msgstr "Nije moguće izbrisati INI datoteku „%s�"
 
 #: ../src/msw/registry.cpp:805
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "Nije moguće izbrisati vrijednost '%s' klju�a '%s'"
+msgstr "Nije moguće izbrisati vrijednost „%s� klju�a „%s�"
 
 #: ../src/msw/registry.cpp:1171
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "Nije moguće numeriranje podklju�eva klju�a '%s'"
+msgstr "Nije moguće numeriranje podklju�eva klju�a „%s�"
 
 #: ../src/msw/registry.cpp:1132
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "Nije moguće numeriranje vrijednosti klju�a '%s'"
+msgstr "Nije moguće numeriranje vrijednosti klju�a „%s�"
 
 #: ../src/msw/registry.cpp:1389
 #, c-format
@@ -1699,12 +1701,12 @@ msgstr "Nije moguće izvesti vrijednost nepodržane vrste %d."
 #: ../src/common/ffile.cpp:254
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "Nije moguće naći trenuta�nu poziciju u datoteci '%s'"
+msgstr "Nije moguće naći trenuta�ni položaj u datoteci „%s�"
 
 #: ../src/msw/registry.cpp:418
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "Nije moguće dobiti informacije o klju�u '%s'"
+msgstr "Nije moguće dobiti informacije o klju�u „%s�"
 
 #: ../src/common/zstream.cpp:346
 msgid "Can't initialize zlib deflate stream."
@@ -1717,12 +1719,12 @@ msgstr "Nije moguće inicijalizirati zlib inflate tijek."
 #: ../src/msw/fswatcher.cpp:476
 #, c-format
 msgid "Can't monitor non-existent directory \"%s\" for changes."
-msgstr "Nije moguće praćenje promjena za nepostojeći direktorij \"%s\"."
+msgstr "Nije moguće praćenje promjena za nepostojeći direktorij „%s�."
 
 #: ../src/msw/registry.cpp:454
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "Nije moguće otvoriti registarski klju� '%s'"
+msgstr "Nije moguće otvoriti registarski klju� „%s�"
 
 #: ../src/common/zstream.cpp:252
 #, c-format
@@ -1738,18 +1740,18 @@ msgstr ""
 #: ../src/msw/registry.cpp:1064
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "Nije moguće �itanje vrijednosti od '%s'"
+msgstr "Nije moguće �itanje vrijednosti od „%s�"
 
 #: ../src/msw/registry.cpp:878 ../src/msw/registry.cpp:910
 #: ../src/msw/registry.cpp:975
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "Nije moguće �itanje vrijednosti od klju�a '%s'"
+msgstr "Nije moguće �itanje vrijednosti od klju�a „%s�"
 
 #: ../src/common/image.cpp:2620
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "Nije moguće spremanje slikovne datoteke '%s': nepoznati sufiks."
+msgstr "Nije moguće spremanje slikovne datoteke „%s�: nepoznati sufiks."
 
 #: ../src/generic/logg.cpp:573 ../src/generic/logg.cpp:976
 msgid "Can't save log contents to file."
@@ -1763,7 +1765,7 @@ msgstr "Nije moguće postaviti prioritet tijeka"
 #: ../src/msw/registry.cpp:1081
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "Nije moguće postavljanje vrijednosti od '%s'"
+msgstr "Nije moguće postavljanje vrijednosti od „%s�"
 
 #: ../src/unix/utilsunx.cpp:351
 msgid "Can't write to child process's stdin"
@@ -1780,17 +1782,17 @@ msgstr "Nije moguće pisati u deflate tijek: %s"
 #: ../src/msw/msgdlg.cpp:454 ../src/msw/progdlg.cpp:673
 #: ../src/gtk1/fontdlg.cpp:144 ../src/motif/msgdlg.cpp:196
 msgid "Cancel"
-msgstr "Cancel"
+msgstr "Odustani"
 
 #: ../src/common/filefn.cpp:1261
 #, c-format
 msgid "Cannot enumerate files '%s'"
-msgstr "Nije moguće numerirati datoteke '%s'"
+msgstr "Nije moguće numerirati datoteke „%s�"
 
 #: ../src/msw/dir.cpp:263
 #, c-format
 msgid "Cannot enumerate files in directory '%s'"
-msgstr "Nije moguće numerirati datoteke u mapi '%s'"
+msgstr "Nije moguće numerirati datoteke u mapi „%s�"
 
 #: ../src/msw/dialup.cpp:523
 #, c-format
@@ -1804,7 +1806,7 @@ msgstr "Nije moguće naći mjesto datoteke adresara"
 #: ../src/msw/ole/automtn.cpp:562
 #, c-format
 msgid "Cannot get an active instance of \"%s\""
-msgstr "Nije moguće dobiti aktivnu instancu \"%s\""
+msgstr "Nije moguće dobiti aktivnu instancu „%s�"
 
 #: ../src/unix/threadpsx.cpp:1035
 #, c-format
@@ -1834,17 +1836,17 @@ msgstr "Nije moguće inicijalizirati priklju�ke"
 #: ../src/msw/volume.cpp:619
 #, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "Nije moguće u�itati ikone iz '%s'."
+msgstr "Nije moguće u�itati ikone iz „%s�."
 
 #: ../src/xrc/xmlres.cpp:360
 #, c-format
 msgid "Cannot load resources from '%s'."
-msgstr "Nije moguće u�itati resurse iz '%s'."
+msgstr "Nije moguće u�itati resurse iz „%s�."
 
 #: ../src/xrc/xmlres.cpp:742
 #, c-format
 msgid "Cannot load resources from file '%s'."
-msgstr "Nije moguće u�itati resurse iz datoteke '%s'."
+msgstr "Nije moguće u�itati resurse iz datoteke „%s�."
 
 #: ../src/html/htmlfilt.cpp:137
 #, c-format
@@ -1873,7 +1875,7 @@ msgstr "Nije moguće otvoriti datoteku indeksa: %s"
 #: ../src/xrc/xmlres.cpp:724
 #, c-format
 msgid "Cannot open resources file '%s'."
-msgstr "Nije moguće otvoriti datoteku resursa '%s'."
+msgstr "Nije moguće otvoriti datoteku resursa „%s�."
 
 #: ../src/html/helpwnd.cpp:1534
 msgid "Cannot print empty page."
@@ -1882,7 +1884,7 @@ msgstr "Nije moguće ispisati praznu stranicu."
 #: ../src/msw/volume.cpp:507
 #, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "Nije moguće �itati ime vrste od '%s'!"
+msgstr "Nije moguće �itati ime vrste od „%s�!"
 
 #: ../src/msw/thread.cpp:888
 #, c-format
@@ -1896,7 +1898,7 @@ msgstr "Nije moguće pronaći pravila rasporeda tijeka."
 #: ../src/common/intl.cpp:558
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
-msgstr "Nije moguće postaviti lokalizaciju za \"%s\" jezik."
+msgstr "Nije moguće postaviti lokalizaciju za „%s� jezik."
 
 #: ../src/unix/threadpsx.cpp:831 ../src/msw/thread.cpp:546
 msgid "Cannot start thread: error writing TLS."
@@ -1914,12 +1916,12 @@ msgstr "Nije moguće �ekati na prekid tijeka"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:75
 msgid "Capital"
-msgstr "Capital"
+msgstr "Verzali"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:879
 msgid "CaptionText"
-msgstr "CaptionText"
+msgstr "Tekst podnaslova"
 
 #: ../src/html/helpwnd.cpp:533
 msgid "Case sensitive"
@@ -1993,12 +1995,12 @@ msgstr "Promijeni stil"
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 "Promjene neće biti spremljene, kako bi se izbjeglo prepisivanje postojeće "
-"datoteke \"%s\""
+"datoteke „%s�"
 
 #: ../src/gtk/filepicker.cpp:190 ../src/gtk/filedlg.cpp:87
 #, c-format
 msgid "Changing current directory to \"%s\" failed"
-msgstr "Mijenjanje trenuta�ne mape u \"%s\""
+msgstr "Mijenjanje trenuta�ne mape u „%s�"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1757
@@ -2113,7 +2115,7 @@ msgstr "Odaberi font"
 #: ../src/common/module.cpp:74
 #, c-format
 msgid "Circular dependency involving module \"%s\" detected."
-msgstr "Ustanovljena je beskona�na ovisnost u modulu \"%s\"."
+msgstr "Ustanovljena je beskona�na ovisnost u modulu „%s�."
 
 #: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:97
 msgid "Cl&ose"
@@ -2126,7 +2128,7 @@ msgstr "Klasa nije registrirana."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/stockitem.cpp:147 ../src/common/accelcmn.cpp:72
 msgid "Clear"
-msgstr "Clear"
+msgstr "Izbriši"
 
 #: ../src/generic/logg.cpp:514
 msgid "Clear the log contents"
@@ -2285,15 +2287,16 @@ msgstr "Stupac %u"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:114
 msgid "Command"
-msgstr "Command"
+msgstr "Naredba"
 
 #: ../src/common/init.cpp:196
 #, c-format
 msgid ""
-"Command line argument %d couldn't be converted to Unicode and will be ignored."
+"Command line argument %d couldn't be converted to Unicode and will be "
+"ignored."
 msgstr ""
-"Argument naredbenog retka %d nije bilo moguće konvertirati u Unicode i bit će "
-"zanemaren."
+"Argument naredbenog retka %d nije bilo moguće konvertirati u Unicode i bit "
+"će zanemaren."
 
 #: ../src/msw/fontdlg.cpp:120
 #, c-format
@@ -2319,7 +2322,7 @@ msgstr "Ra�unalo"
 #: ../src/common/fileconf.cpp:934
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "Konfiguracijsko ulazno ime ne može po�eti s '%c'."
+msgstr "Konfiguracijsko ulazno ime ne može po�eti s „%c�."
 
 #: ../src/generic/filedlgg.cpp:349 ../src/gtk/filedlg.cpp:60
 msgid "Confirm"
@@ -2336,17 +2339,17 @@ msgstr "Sadržaj"
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:880
 msgid "ControlDark"
-msgstr "ControlDark"
+msgstr "Upravlja� tamno"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:881
 msgid "ControlLight"
-msgstr "ControlLight"
+msgstr "Upravlja� svjetlo"
 
 #: ../src/common/strconv.cpp:2262
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr "Konverzija u kodnu stranicu '%s' ne radi."
+msgstr "Konverzija u kodnu stranicu „%s� ne radi."
 
 #: ../src/common/stockitem.cpp:149
 msgid "Convert"
@@ -2355,7 +2358,7 @@ msgstr "Pretvori"
 #: ../src/html/htmlwin.cpp:1079
 #, c-format
 msgid "Copied to clipboard:\"%s\""
-msgstr "Kopirano u međuspremnik:\"%s\""
+msgstr "Kopirano u međuspremnik:„%s�"
 
 #: ../src/generic/prntdlgg.cpp:247
 msgid "Copies:"
@@ -2381,7 +2384,7 @@ msgstr "Polumjer kuta:"
 #: ../src/html/chm.cpp:718
 #, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "Nije bilo moguće stvoriti privremenu datoteku '%s'"
+msgstr "Nije bilo moguće stvoriti privremenu datoteku „%s�"
 
 #: ../src/html/chm.cpp:273
 #, c-format
@@ -2399,7 +2402,7 @@ msgstr "Nije bilo moguće inicijalizirati libnotify."
 #: ../src/html/chm.cpp:444
 #, c-format
 msgid "Could not locate file '%s'."
-msgstr "Nije bilo moguće pronaći datoteku '%s'."
+msgstr "Nije bilo moguće pronaći datoteku „%s�."
 
 #: ../src/common/filefn.cpp:1403
 msgid "Could not set current working directory"
@@ -2444,7 +2447,7 @@ msgstr "Nije bilo moguće numerirati prijevode"
 #: ../src/common/dynlib.cpp:120
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "Nije bilo moguće naći simbol '%s' u dinami�koj biblioteci"
+msgstr "Nije bilo moguće naći simbol „%s� u dinami�koj biblioteci"
 
 #: ../src/msw/thread.cpp:915
 msgid "Couldn't get the current thread pointer"
@@ -2467,7 +2470,7 @@ msgstr ""
 #: ../src/unix/sound.cpp:470
 #, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "Nije bilo moguće u�itati zvukovne podatke od '%s'."
+msgstr "Nije bilo moguće u�itati zvukovne podatke od „%s�."
 
 #: ../src/msw/dirdlg.cpp:435
 msgid "Couldn't obtain folder name"
@@ -2481,7 +2484,7 @@ msgstr "Nije bilo moguće otvoriti audio: %s"
 #: ../src/msw/ole/dataobj.cpp:377
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "Nije bilo moguće registrirati format međuspremnika '%s'."
+msgstr "Nije bilo moguće registrirati format međuspremnika „%s�."
 
 #: ../src/msw/listctrl.cpp:869
 #, c-format
@@ -2513,7 +2516,7 @@ msgstr "Stvori novu mapu"
 #: ../src/xrc/xmlres.cpp:2460
 #, c-format
 msgid "Creating %s \"%s\" failed."
-msgstr "Stvaranje %s \"%s\"."
+msgstr "Stvaranje %s „%s� nije uspjelo."
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1758
@@ -2598,7 +2601,7 @@ msgstr "Isprekidano"
 #: ../src/generic/dbgrptg.cpp:300
 #, c-format
 msgid "Debug report \"%s\""
-msgstr "Izvještaj o otklanjanju grešaka \"%s\""
+msgstr "Izvještaj o otklanjanju grešaka „%s�"
 
 #: ../src/common/debugrpt.cpp:210
 msgid "Debug report couldn't be created."
@@ -2611,7 +2614,7 @@ msgstr "Stvaranje izvještaja o otklanjanju grešaka."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:84
 msgid "Decimal"
-msgstr "Decimal"
+msgstr "Decimala"
 
 #: ../src/generic/fontdlgg.cpp:323
 msgid "Decorative"
@@ -2637,13 +2640,13 @@ msgstr "Zadani pisa�"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:51
 msgid "Del"
-msgstr "Del"
+msgstr "Izbriši"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/richtext/richtextbuffer.cpp:8221 ../src/common/stockitem.cpp:152
 #: ../src/common/accelcmn.cpp:50 ../src/stc/stc_i18n.cpp:20
 msgid "Delete"
-msgstr "Delete"
+msgstr "Izbriši"
 
 #: ../src/richtext/richtexttabspage.cpp:144
 msgid "Delete A&ll"
@@ -2681,17 +2684,17 @@ msgstr "Izbrisati stil %s?"
 #: ../src/unix/snglinst.cpp:301
 #, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "Izbrisana je stara datoteka zaklju�avanja '%s'."
+msgstr "Izbrisana je stara datoteka zaklju�avanja „%s�."
 
 #: ../src/common/secretstore.cpp:220
 #, c-format
 msgid "Deleting password for \"%s/%s\" failed: %s."
-msgstr "Brisanje lozinke za \"%s/%s\": %s."
+msgstr "Brisanje lozinke za „%s/%s�: %s."
 
 #: ../src/common/module.cpp:124
 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
-msgstr "Ovisnost \"%s\" o modulu \"%s\" ne postoji."
+msgstr "Ovisnost „%s� o modulu „%s� ne postoji."
 
 #: ../src/common/stockitem.cpp:196
 msgid "Descending"
@@ -2720,7 +2723,7 @@ msgstr ""
 
 #: ../src/generic/tipdlg.cpp:211
 msgid "Did you know..."
-msgstr "Da li znaš …"
+msgstr "Je li znaš …"
 
 #: ../src/dfb/wrapdfb.cpp:63
 #, c-format
@@ -2734,12 +2737,12 @@ msgstr "Mape"
 #: ../src/common/filefn.cpp:1183
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "Nije bilo moguće stvoriti mapu '%s'"
+msgstr "Nije bilo moguće stvoriti mapu „%s�"
 
 #: ../src/common/filefn.cpp:1197
 #, c-format
 msgid "Directory '%s' couldn't be deleted"
-msgstr "Nije bilo moguće izbrisati mapu '%s'"
+msgstr "Nije bilo moguće izbrisati mapu „%s�"
 
 #: ../src/generic/dirdlgg.cpp:204
 msgid "Directory does not exist"
@@ -2772,12 +2775,12 @@ msgstr "Prikazuje pomoć prilikom pregledavanja knjiga na lijevo strani."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:85
 msgid "Divide"
-msgstr "Divide"
+msgstr "Dijeli"
 
 #: ../src/common/docview.cpp:533
 #, c-format
 msgid "Do you want to save changes to %s?"
-msgstr "Da li želiš spremiti promjene u %s?"
+msgstr "Želiš li spremiti promjene u %s?"
 
 #: ../src/common/prntbase.cpp:542
 msgid "Document:"
@@ -2824,7 +2827,7 @@ msgstr "Dvostruko korišten id : %d"
 #: ../src/generic/fdrepdlg.cpp:152 ../src/common/stockitem.cpp:153
 #: ../src/common/accelcmn.cpp:64
 msgid "Down"
-msgstr "Down"
+msgstr "Dolje"
 
 #: ../src/richtext/richtextctrl.cpp:865
 msgid "Drag"
@@ -2855,72 +2858,72 @@ msgstr "Proteklo vrijeme:"
 #: ../src/richtext/richtextsizepage.cpp:465
 #: ../src/richtext/richtextsizepage.cpp:467
 msgid "Enable the height value."
-msgstr "Omogući vrijednost visine."
+msgstr "Aktiviraj vrijednost visine."
 
 #: ../src/richtext/richtextsizepage.cpp:438
 #: ../src/richtext/richtextsizepage.cpp:440
 msgid "Enable the maximum width value."
-msgstr "Omogući maksimalnu vrijednost širine."
+msgstr "Aktiviraj maksimalnu vrijednost Å¡irine."
 
 #: ../src/richtext/richtextsizepage.cpp:411
 #: ../src/richtext/richtextsizepage.cpp:413
 msgid "Enable the minimum height value."
-msgstr "Omogući minimalnu vrijednost visine."
+msgstr "Aktiviraj minimalnu vrijednost visine."
 
 #: ../src/richtext/richtextsizepage.cpp:384
 #: ../src/richtext/richtextsizepage.cpp:386
 msgid "Enable the minimum width value."
-msgstr "Omogući minimalnu vrijednost širine."
+msgstr "Aktiviraj minimalnu vrijednost Å¡irine."
 
 #: ../src/richtext/richtextsizepage.cpp:319
 #: ../src/richtext/richtextsizepage.cpp:321
 msgid "Enable the width value."
-msgstr "Omogući vrijednost širine."
+msgstr "Aktiviraj vrijednost Å¡irine."
 
 #: ../src/richtext/richtextsizepage.cpp:280
 #: ../src/richtext/richtextsizepage.cpp:282
 msgid "Enable vertical alignment."
-msgstr "Omogući uspravno poravnanje."
+msgstr "Aktiviraj uspravno poravnanje."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:162
 #: ../src/richtext/richtextbackgroundpage.cpp:164
 msgid "Enables a background colour."
-msgstr "Omogućava pozadinsku boju."
+msgstr "Aktivira pozadinsku boju."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:196
 #: ../src/richtext/richtextbackgroundpage.cpp:198
 msgid "Enables a shadow."
-msgstr "Omogućava sjenu."
+msgstr "Aktivira sjenu."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:300
 #: ../src/richtext/richtextbackgroundpage.cpp:302
 msgid "Enables the blur distance."
-msgstr "Omogućava udaljenost mutnoće."
+msgstr "Aktivira udaljenost mutnoće."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:260
 #: ../src/richtext/richtextbackgroundpage.cpp:262
 msgid "Enables the shadow colour."
-msgstr "Omogućava boju sjene."
+msgstr "Aktivira boju sjene."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:327
 #: ../src/richtext/richtextbackgroundpage.cpp:329
 msgid "Enables the shadow opacity."
-msgstr "Omogućava neprozirnost sjene."
+msgstr "Aktivira neprozirnost sjene."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:273
 #: ../src/richtext/richtextbackgroundpage.cpp:275
 msgid "Enables the shadow spread."
-msgstr "Omogućava rasprostiranje sjene."
+msgstr "Aktivira rasprostiranje sjene."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:66
 msgid "End"
-msgstr "End"
+msgstr "Kraj"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:55
 msgid "Enter"
-msgstr "Enter"
+msgstr "Unesi"
 
 #: ../src/richtext/richtextstyledlg.cpp:934
 msgid "Enter a box style name"
@@ -2945,7 +2948,7 @@ msgstr "Unesi ime stila odlomka"
 #: ../src/generic/dbgrptg.cpp:174
 #, c-format
 msgid "Enter command to open file \"%s\":"
-msgstr "Unesi naredbu za otvaranje datoteke \"%s\":"
+msgstr "Unesi naredbu za otvaranje datoteke „%s�:"
 
 #: ../src/generic/helpext.cpp:459
 msgid "Entries found"
@@ -2959,7 +2962,9 @@ msgstr "Kuverta pozivnice 220 × 220 mm"
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr "Proširenje varijable okruženja: nedostaje '%c' na položaju %u u '%s'."
+msgstr ""
+"Proširenje varijable okruženja nije uspjelo: nedostaje „%c� na položaju %u u "
+"„%s�."
 
 #: ../src/generic/filedlgg.cpp:357 ../src/generic/dirctrlg.cpp:570
 #: ../src/generic/dirctrlg.cpp:588 ../src/generic/dirctrlg.cpp:599
@@ -2982,7 +2987,7 @@ msgstr "Greška prilikom zatvaranja kqueue instance"
 #: ../src/common/filefn.cpp:1049
 #, c-format
 msgid "Error copying the file '%s' to '%s'."
-msgstr "Greška prilikom kopiranja datoteke '%s' u '%s'."
+msgstr "Greška prilikom kopiranja datoteke „%s� u „%s�."
 
 #: ../src/generic/dirdlgg.cpp:222
 msgid "Error creating directory"
@@ -2990,12 +2995,12 @@ msgstr "Greška prilikom stvaranja mape"
 
 #: ../src/common/imagbmp.cpp:1181
 msgid "Error in reading image DIB."
-msgstr "Greška prilikom �itanja DIB slike."
+msgstr "Greška u �itanju DIB slike."
 
 #: ../src/propgrid/propgrid.cpp:6696
 #, c-format
 msgid "Error in resource: %s"
-msgstr "Grešk u resursu: %s"
+msgstr "Greška u resursu: %s"
 
 #: ../src/common/fileconf.cpp:422
 msgid "Error reading config options."
@@ -3038,7 +3043,7 @@ msgstr "Izvršavajuće datoteke (*.exe)|*.exe|"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/stockitem.cpp:155 ../src/common/accelcmn.cpp:78
 msgid "Execute"
-msgstr "Execute"
+msgstr "Izvrši"
 
 #: ../src/msw/utilsexc.cpp:876
 #, c-format
@@ -3058,7 +3063,8 @@ msgstr "Proširi"
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
-msgstr "Izvoz klju�a registra: datoteka „%s� već postoji i neće biti prepisana."
+msgstr ""
+"Izvoz klju�a registra: datoteka „%s� već postoji i neće biti prepisana."
 
 #: ../src/common/fmapbase.cpp:195
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
@@ -3067,7 +3073,7 @@ msgstr "Proširena Unix kodna strana za japanski (EUC-JP)"
 #: ../src/html/chm.cpp:725
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "Izvla�enje iz '%s' u '%s'."
+msgstr "Izvla�enje iz „%s� u „%s�."
 
 #: ../src/common/accelcmn.cpp:249 ../src/common/accelcmn.cpp:344
 msgid "F"
@@ -3103,12 +3109,12 @@ msgstr "Neuspjelo mijenjanje video modusa"
 #: ../src/common/image.cpp:3277
 #, c-format
 msgid "Failed to check format of image file \"%s\"."
-msgstr "Neuspjela provjera formata datoteke slike \"%s\"."
+msgstr "Neuspjela provjera formata datoteke slike „%s�."
 
 #: ../src/common/debugrpt.cpp:239
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
-msgstr "Neuspjelo sređivanje mape za izještaje o otklanjanju grešaka \"%s\"."
+msgstr "Neuspjelo sređivanje mape za izještaje o otklanjanju grešaka „%s�."
 
 #: ../src/common/filename.cpp:192
 msgid "Failed to close file handle"
@@ -3117,7 +3123,7 @@ msgstr "Neuspjelo zatvaranje upravlja�a datotekama"
 #: ../src/unix/snglinst.cpp:340
 #, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "Neuspjelo zatvaranje zaklju�ne datoteke '%s'"
+msgstr "Neuspjelo zatvaranje zaklju�ne datoteke „%s�"
 
 #: ../src/msw/clipbrd.cpp:112
 msgid "Failed to close the clipboard."
@@ -3126,7 +3132,7 @@ msgstr "Neuspjelo zatvaranje međuspremnika."
 #: ../src/x11/utils.cpp:208
 #, c-format
 msgid "Failed to close the display \"%s\""
-msgstr "Neuspjelo zatvaranje prikaza \"%s\""
+msgstr "Neuspjelo zatvaranje prikaza „%s�"
 
 #: ../src/msw/dialup.cpp:797
 msgid "Failed to connect: missing username/password."
@@ -3134,12 +3140,12 @@ msgstr "Neuspjelo povezivanje: nedostaje korisni�ko ime/lozinka."
 
 #: ../src/msw/dialup.cpp:743
 msgid "Failed to connect: no ISP to dial."
-msgstr "Neuspjelo povezivanje: nema ISP za biranje"
+msgstr "Neuspjelo povezivanje: nema ISP za biranje."
 
 #: ../src/common/textfile.cpp:203
 #, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
-msgstr "Neuspjelo konvertiranje datoteke \"%s\" u Unicode."
+msgstr "Neuspjelo konvertiranje datoteke „%s� u Unicode."
 
 #: ../src/generic/logg.cpp:956
 msgid "Failed to copy dialog contents to the clipboard."
@@ -3148,22 +3154,22 @@ msgstr "Neuspjelo kopiranje sadržaja dijaloga u međuspremnik."
 #: ../src/msw/registry.cpp:692
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "Neuspjelo kopiranje registarske vrijednost '%s'"
+msgstr "Neuspjelo kopiranje registarske vrijednost „%s�"
 
 #: ../src/msw/registry.cpp:701
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "Neuspjelo kopiranje sadržaja registarskog klju�a '%s' u '%s'."
+msgstr "Neuspjelo kopiranje sadržaja registarskog klju�a „%s� u „%s�."
 
 #: ../src/common/filefn.cpp:1015
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "Neuspjelo kopiranje datoteke '%s' u '%s'"
+msgstr "Neuspjelo kopiranje datoteke „%s� u „%s�"
 
 #: ../src/msw/registry.cpp:679
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "Neuspjelo kopiranje registarskog pod-klju�a '%s' u '%s'."
+msgstr "Neuspjelo kopiranje registarskog pod-klju�a „%s� u „%s�."
 
 #: ../src/msw/dde.cpp:1070
 msgid "Failed to create DDE string"
@@ -3184,12 +3190,12 @@ msgstr "Neuspjelo stvaranje anonimnog cjevovoda"
 #: ../src/msw/ole/automtn.cpp:522
 #, c-format
 msgid "Failed to create an instance of \"%s\""
-msgstr "Neuspjelo stvaranje instance od \"%s\""
+msgstr "Neuspjelo stvaranje instance od „%s�"
 
 #: ../src/msw/dde.cpp:437
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "Neuspjelo povezivanje na server '%s' na temu '%s'"
+msgstr "Neuspjelo povezivanje na server „%s� na temu „%s�"
 
 #: ../src/msw/cursor.cpp:204
 msgid "Failed to create cursor."
@@ -3198,7 +3204,7 @@ msgstr "Neuspjelo stvaranje pokaziva�a."
 #: ../src/common/debugrpt.cpp:209
 #, c-format
 msgid "Failed to create directory \"%s\""
-msgstr "Neuspjelo stvaranje direktorija \"%s\""
+msgstr "Neuspjelo stvaranje direktorija „%s�"
 
 #: ../src/generic/dirdlgg.cpp:220
 #, c-format
@@ -3206,7 +3212,7 @@ msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"Neuspjela izrada direktorija '%s'\n"
+"Neuspjela izrada direktorija „%s�\n"
 "(Imaš li potrebna korisni�ka prava?)"
 
 #: ../src/unix/epolldispatcher.cpp:84
@@ -3216,7 +3222,7 @@ msgstr "Neuspjelo stvaranje epoll deskriptora"
 #: ../src/msw/mimetype.cpp:238
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "Neuspjela izrada registarskog unosa za '%s' datoteka."
+msgstr "Neuspjela izrada registarskog unosa za „%s� datoteka."
 
 #: ../src/msw/fdrepdlg.cpp:409
 #, c-format
@@ -3252,7 +3258,7 @@ msgstr "Neuspjelo stvaranje aktivne veze pozivanja: %s"
 #: ../src/unix/utilsunx.cpp:611
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "Neuspjelo izvršavanje '%s'\n"
+msgstr "Neuspjelo izvršavanje „%s�\n"
 
 #: ../src/common/debugrpt.cpp:720
 msgid "Failed to execute curl, please install it in PATH."
@@ -3261,7 +3267,7 @@ msgstr "Neuspjelo izvršavanje curl-a, instaliraj ga u PATH."
 #: ../src/msw/ole/automtn.cpp:505
 #, c-format
 msgid "Failed to find CLSID of \"%s\""
-msgstr "Neuspjelo pronalaženje CLSID-a od \"%s\""
+msgstr "Neuspjelo pronalaženje CLSID-a od „%s�"
 
 #: ../src/common/regex.cpp:431 ../src/common/regex.cpp:479
 #, c-format
@@ -3276,7 +3282,7 @@ msgstr "Neuspjelo dobivanje ISP imena: %s"
 #: ../src/msw/ole/automtn.cpp:574
 #, c-format
 msgid "Failed to get OLE automation interface for \"%s\""
-msgstr "Neuspjelo dobivanje OLE su�elje automatizacije za \"%s\""
+msgstr "Neuspjelo dobivanje OLE su�elje automatizacije za „%s�"
 
 #: ../src/msw/clipbrd.cpp:711
 msgid "Failed to get data from the clipboard"
@@ -3314,7 +3320,7 @@ msgstr "Neuspjelo umetanje teksta u kontrolu."
 #: ../src/unix/snglinst.cpp:241
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
-msgstr "Neuspjelo provjeravanje zaklju�ne datoteke '%s'"
+msgstr "Neuspjelo provjeravanje zaklju�ne datoteke „%s�"
 
 #: ../src/unix/appunix.cpp:182
 msgid "Failed to install signal handler"
@@ -3336,22 +3342,22 @@ msgstr "Neuspjelo nasilno prekidanje procesa %d"
 #: ../src/common/image.cpp:2500
 #, c-format
 msgid "Failed to load bitmap \"%s\" from resources."
-msgstr "Neuspjelo u�itavanje bitmapa \"%s\" iz resursa."
+msgstr "Neuspjelo u�itavanje bitmapa „%s� iz resursa."
 
 #: ../src/common/image.cpp:2509
 #, c-format
 msgid "Failed to load icon \"%s\" from resources."
-msgstr "Neuspjelo u�itavanje ikone \"%s\" iz resursa."
+msgstr "Neuspjelo u�itavanje ikone „%s� iz resursa."
 
 #: ../src/common/iconbndl.cpp:225
 #, c-format
 msgid "Failed to load icons from resource '%s'."
-msgstr "Neuspjelo u�itavanje ikona iz resursa '%s'."
+msgstr "Neuspjelo u�itavanje ikona iz resursa „%s�."
 
 #: ../src/common/iconbndl.cpp:200
 #, c-format
 msgid "Failed to load image %%d from file '%s'."
-msgstr "Neuspjelo u�itavanje slike %%d iz datoteke '%s'."
+msgstr "Neuspjelo u�itavanje slike %%d iz datoteke „%s�."
 
 #: ../src/common/iconbndl.cpp:208
 #, c-format
@@ -3361,12 +3367,12 @@ msgstr "Neuspjelo u�itavanje slike %d iz tijeka."
 #: ../src/common/image.cpp:2587 ../src/common/image.cpp:2606
 #, c-format
 msgid "Failed to load image from file \"%s\"."
-msgstr "Neuspjelo u�itavanje slike iz datoteke \"%s\"."
+msgstr "Neuspjelo u�itavanje slike iz datoteke „%s�."
 
 #: ../src/msw/enhmeta.cpp:97
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
-msgstr "Neuspjelo u�itavanje metafile iz datoteke \"%s\"."
+msgstr "Neuspjelo u�itavanje metafile iz datoteke „%s�."
 
 #: ../src/msw/volume.cpp:327
 msgid "Failed to load mpr.dll."
@@ -3375,27 +3381,27 @@ msgstr "Neuspjelo u�itavanje mpr.dll."
 #: ../src/msw/utils.cpp:953
 #, c-format
 msgid "Failed to load resource \"%s\"."
-msgstr "Neuspjelo u�itavanje resursa \"%s\"."
+msgstr "Neuspjelo u�itavanje resursa „%s�."
 
 #: ../src/common/dynlib.cpp:92
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "Neuspjelo u�itavanje dijeljenje biblioteke \"%s\"."
+msgstr "Neuspjelo u�itavanje dijeljenje biblioteke „%s�."
 
 #: ../src/osx/core/sound.cpp:145
 #, c-format
 msgid "Failed to load sound from \"%s\" (error %d)."
-msgstr "Neuspjelo u�itavanje zvuka iz \"%s\". (greška %d)."
+msgstr "Neuspjelo u�itavanje zvuka iz „%s�. (greška %d)."
 
 #: ../src/msw/utils.cpp:960
 #, c-format
 msgid "Failed to lock resource \"%s\"."
-msgstr "Neuspjelo zaklju�avanje resursa \"%s\"."
+msgstr "Neuspjelo zaklju�avanje resursa „%s�."
 
 #: ../src/unix/snglinst.cpp:198
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "Neuspjelo zaklju�avanje zaklju�ne datoteke \"%s\"."
+msgstr "Neuspjelo zaklju�avanje zaklju�ne datoteke „%s�."
 
 #: ../src/unix/epolldispatcher.cpp:136
 #, c-format
@@ -3405,7 +3411,7 @@ msgstr "Neuspjelo mijenjanje deskriptora %d u epoll deskriptoru %d"
 #: ../src/common/filename.cpp:2575
 #, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "Neuspjelo mijenjanje vremena datoteke za '%s'"
+msgstr "Neuspjelo mijenjanje vremena datoteke za „%s�"
 
 #: ../src/common/selectdispatcher.cpp:258
 msgid "Failed to monitor I/O channels"
@@ -3414,32 +3420,32 @@ msgstr "Neuspjelo praćenje ulaznih/izlaznih kanala"
 #: ../src/common/filename.cpp:175
 #, c-format
 msgid "Failed to open '%s' for reading"
-msgstr "Neuspjelo otvaranje '%s' za �itanje"
+msgstr "Neuspjelo otvaranje „%s� za �itanje"
 
 #: ../src/common/filename.cpp:180
 #, c-format
 msgid "Failed to open '%s' for writing"
-msgstr "Neuspjelo otvaranje '%s' za pisanje"
+msgstr "Neuspjelo otvaranje „%s� za pisanje"
 
 #: ../src/html/chm.cpp:141
 #, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "Neuspjelo otvaranje CHM arhive '%s'."
+msgstr "Neuspjelo otvaranje CHM arhive „%s�."
 
 #: ../src/common/utilscmn.cpp:1126
 #, c-format
 msgid "Failed to open URL \"%s\" in default browser."
-msgstr "Neuspjelo otvaranje URL-a \"%s\" u zadanom pregledniku."
+msgstr "Neuspjelo otvaranje URL-a „%s� u zadanom pregledniku."
 
 #: ../include/wx/msw/private/fswatcher.h:92
 #, c-format
 msgid "Failed to open directory \"%s\" for monitoring."
-msgstr "Neuspjelo otvaranje direktorija \"%s\" za praćenje."
+msgstr "Neuspjelo otvaranje direktorija „%s� za praćenje."
 
 #: ../src/x11/utils.cpp:227
 #, c-format
 msgid "Failed to open display \"%s\"."
-msgstr "Neuspjelo otvaranje ekrana \"%s\"."
+msgstr "Neuspjelo otvaranje ekrana „%s�."
 
 #: ../src/common/filename.cpp:1062
 msgid "Failed to open temporary file."
@@ -3452,12 +3458,12 @@ msgstr "Neuspjelo otvaranje međuspremnika."
 #: ../src/common/translation.cpp:1184
 #, c-format
 msgid "Failed to parse Plural-Forms: '%s'"
-msgstr "Neuspjela obrada oblika množine: '%s'"
+msgstr "Neuspjela obrada oblika množine: „%s�"
 
 #: ../src/unix/mediactrl.cpp:1214
 #, c-format
 msgid "Failed to prepare playing \"%s\"."
-msgstr "Neuspjela priprema pokretanja \"%s\"."
+msgstr "Neuspjela priprema pokretanja „%s�."
 
 #: ../src/msw/clipbrd.cpp:600
 msgid "Failed to put data on the clipboard"
@@ -3474,7 +3480,7 @@ msgstr "Neuspjelo �itanje opcija koniguracije."
 #: ../src/common/docview.cpp:681
 #, c-format
 msgid "Failed to read document from the file \"%s\"."
-msgstr "Neuspjelo �itanje dokumenta iz datoteke \"%s\"."
+msgstr "Neuspjelo �itanje dokumenta iz datoteke „%s�."
 
 #: ../src/dfb/evtloop.cpp:98
 msgid "Failed to read event from DirectFB pipe"
@@ -3495,32 +3501,32 @@ msgstr "Neuspjelo preusmjeravanje podređenog procesa ulaza/izlaza"
 #: ../src/msw/dde.cpp:288
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "Neuspjelo registriranje DDE servera '%s'"
+msgstr "Neuspjelo registriranje DDE servera „%s�"
 
 #: ../src/common/fontmap.cpp:245
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "Neuspjelo pamćenje kodiranja za skupinu znakova '%s'."
+msgstr "Neuspjelo pamćenje kodiranja za skupinu znakova „%s�."
 
 #: ../src/common/debugrpt.cpp:227
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
-msgstr "Neuspjelo uklanjanje datoteke za izvještaj o otklanjanju grešaka \"%s\""
+msgstr "Neuspjelo uklanjanje datoteke za izvještaj o otklanjanju grešaka „%s�"
 
 #: ../src/unix/snglinst.cpp:328
 #, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "Neuspjelo uklanjanje zaklju�ne datoteke '%s'"
+msgstr "Neuspjelo uklanjanje zaklju�ne datoteke „%s�"
 
 #: ../src/unix/snglinst.cpp:288
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "Neuspjelo uklanjanje stare zaklju�ne datoteke '%s'."
+msgstr "Neuspjelo uklanjanje stare zaklju�ne datoteke „%s�."
 
 #: ../src/msw/registry.cpp:529
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "Neuspjelo preimenovanje registarske vrijednost '%s' u '%s'."
+msgstr "Neuspjelo preimenovanje registarske vrijednost „%s� u „%s�."
 
 #: ../src/common/filefn.cpp:1122
 #, c-format
@@ -3528,18 +3534,18 @@ msgid ""
 "Failed to rename the file '%s' to '%s' because the destination file already "
 "exists."
 msgstr ""
-"Neuspjelo preimenovanje datoteke '%s' u '%s', jer odredišna datoteka već "
+"Neuspjelo preimenovanje datoteke „%s� u „%s�, jer odredišna datoteka već "
 "postoji."
 
 #: ../src/msw/registry.cpp:634
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "Neuspjelo preimenovanje registarskog klju�a '%s' u '%s'."
+msgstr "Neuspjelo preimenovanje registarskog klju�a „%s� u „%s�."
 
 #: ../src/common/filename.cpp:2671
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "Neuspjelo dohvaćanje vremena datoteke za '%s'"
+msgstr "Neuspjelo dohvaćanje vremena datoteke za „%s�"
 
 #: ../src/msw/dialup.cpp:468
 msgid "Failed to retrieve text of RAS error message"
@@ -3552,12 +3558,12 @@ msgstr "Neuspjelo dohvaćanje podržavajućih formata za međuspremnik"
 #: ../src/common/docview.cpp:652
 #, c-format
 msgid "Failed to save document to the file \"%s\"."
-msgstr "Neuspjelo spremanje dokumenta u datoteku \"%s\"."
+msgstr "Neuspjelo spremanje dokumenta u datoteku „%s�."
 
 #: ../src/msw/dib.cpp:269
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "Neuspjelo spremanje bitmap slike u datoteku \"%s\"."
+msgstr "Neuspjelo spremanje bitmap slike u datoteku „%s�."
 
 #: ../src/msw/dde.cpp:763
 msgid "Failed to send DDE advise notification"
@@ -3570,12 +3576,12 @@ msgstr "Neuspjelo postavljanje modusa za FTP prijenos na %s."
 
 #: ../src/msw/clipbrd.cpp:427
 msgid "Failed to set clipboard data."
-msgstr "Neuspjelo postavljanje podataka međuspremnika"
+msgstr "Neuspjelo postavljanje podataka međuspremnika."
 
 #: ../src/unix/snglinst.cpp:181
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "Neuspjelo postavljanje korisni�kih prava na zaklju�nu datoteku \"%s\"."
+msgstr "Neuspjelo postavljanje korisni�kih prava na zaklju�nu datoteku „%s�."
 
 #: ../src/unix/utilsunx.cpp:668
 msgid "Failed to set process priority"
@@ -3607,7 +3613,7 @@ msgstr ""
 #: ../src/common/fs_mem.cpp:261
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "Neuspjelo spremanje slike '%s' u VFS memoriju!"
+msgstr "Neuspjelo spremanje slike „%s� u VFS memoriju!"
 
 #: ../src/dfb/evtloop.cpp:170
 msgid "Failed to switch DirectFB pipe to non-blocking mode"
@@ -3633,17 +3639,17 @@ msgstr "Neuspjelo prekidanje veze pozivanja: %s"
 #: ../src/common/filename.cpp:2590
 #, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "Neuspjelo dodirivanje datoteke '%s'"
+msgstr "Neuspjelo dodirivanje datoteke „%s�"
 
 #: ../src/unix/snglinst.cpp:334
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "Neuspjelo otklju�avanje zaklju�ne datoteke '%s'"
+msgstr "Neuspjelo otklju�avanje zaklju�ne datoteke „%s�"
 
 #: ../src/msw/dde.cpp:309
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "Neuspjelo odjavljivanje DDE servera '%s'"
+msgstr "Neuspjelo odjavljivanje DDE servera „%s�"
 
 #: ../src/unix/epolldispatcher.cpp:155
 #, c-format
@@ -3662,7 +3668,7 @@ msgstr "Neuspjeli prijenos izvještaja o ispravljanju grešaka (kôd greške %d)
 #: ../src/unix/snglinst.cpp:168
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "Neuspjelo pisanje u datoteku za zaklju�avanje '%s'."
+msgstr "Neuspjelo pisanje u datoteku za zaklju�avanje „%s�."
 
 #. TRANSLATORS: Name of Boolean false value
 #: ../src/propgrid/propgrid.cpp:209
@@ -3681,27 +3687,27 @@ msgstr "Datoteka"
 #: ../src/common/docview.cpp:669
 #, c-format
 msgid "File \"%s\" could not be opened for reading."
-msgstr "Nije bilo moguće otvoriti datoteku '%s', za �itanje."
+msgstr "Nije bilo moguće otvoriti datoteku „%s�, za �itanje."
 
 #: ../src/common/docview.cpp:646
 #, c-format
 msgid "File \"%s\" could not be opened for writing."
-msgstr "Nije bilo moguće otvoriti datoteku '%s', za zapisivanje."
+msgstr "Nije bilo moguće otvoriti datoteku „%s�, za zapisivanje."
 
 #: ../src/generic/filedlgg.cpp:346 ../src/gtk/filedlg.cpp:57
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "Datoteka '%s'već postoji. Sigurno je želiš prepisati?"
+msgstr "Datoteka „%s�već postoji. Sigurno je želiš prepisati?"
 
 #: ../src/common/filefn.cpp:1156
 #, c-format
 msgid "File '%s' couldn't be removed"
-msgstr "Nije bilo moguće ukloniti datoteku '%s'"
+msgstr "Nije bilo moguće ukloniti datoteku „%s�"
 
 #: ../src/common/filefn.cpp:1139
 #, c-format
 msgid "File '%s' couldn't be renamed '%s'"
-msgstr "Datoteku '%s' nije bilo moguće preimenovati '%s'"
+msgstr "Datoteku „%s� nije bilo moguće preimenovati „%s�"
 
 #: ../src/richtext/richtextctrl.cpp:3081 ../src/common/textcmn.cpp:953
 msgid "File couldn't be loaded."
@@ -3763,7 +3769,7 @@ msgstr "Lebdeći"
 
 #: ../src/common/stockitem.cpp:160
 msgid "Floppy"
-msgstr "Floppy"
+msgstr "Flopi disk"
 
 #: ../src/common/paper.cpp:111
 msgid "Folio, 8 1/2 x 13 in"
@@ -3818,7 +3824,7 @@ msgstr "Od:"
 
 #: ../src/propgrid/advprops.cpp:1604
 msgid "Fuchsia"
-msgstr "Lisi�ja"
+msgstr "Fuksija"
 
 #: ../src/common/imaggif.cpp:138
 msgid "GIF: data stream seems to be truncated."
@@ -3903,7 +3909,7 @@ msgstr "Siva"
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:883
 msgid "GrayText"
-msgstr "GrayText"
+msgstr "Sivi tekst"
 
 #: ../src/common/fmapbase.cpp:154
 msgid "Greek (ISO-8859-7)"
@@ -3956,7 +3962,7 @@ msgstr "Hebrejski (ISO-8859-8-E)"
 #: ../src/common/stockitem.cpp:163 ../src/common/accelcmn.cpp:80
 #: ../src/html/helpdlg.cpp:66 ../src/html/helpfrm.cpp:111
 msgid "Help"
-msgstr "Help"
+msgstr "Pomoć"
 
 #: ../src/html/helpwnd.cpp:1200
 msgid "Help Browser Options"
@@ -3981,12 +3987,12 @@ msgstr "Pomoćne knjige (*.htb)|*.htb|Pomoćne knjige (*.zip)|*.zip|"
 #: ../src/generic/helpext.cpp:267
 #, c-format
 msgid "Help directory \"%s\" not found."
-msgstr "Mapa pomoći \"%s\" nije nađena."
+msgstr "Mapa pomoći „%s� nije nađena."
 
 #: ../src/generic/helpext.cpp:275
 #, c-format
 msgid "Help file \"%s\" not found."
-msgstr "Datoteka pomoći \"%s\" nije nađena."
+msgstr "Datoteka pomoći „%s� nije nađena."
 
 #: ../src/html/helpctrl.cpp:63
 #, c-format
@@ -4009,17 +4015,17 @@ msgstr "Sakrij ovu obavijest."
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:884
 msgid "Highlight"
-msgstr "Highlight"
+msgstr "Istakni"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:885
 msgid "HighlightText"
-msgstr "HighlightText"
+msgstr "Istakni tekst"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/stockitem.cpp:164 ../src/common/accelcmn.cpp:65
 msgid "Home"
-msgstr "Home"
+msgstr "Po�etna"
 
 #: ../src/generic/dirctrlg.cpp:524
 msgid "Home directory"
@@ -4102,15 +4108,15 @@ msgid ""
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
-"Ako ne želiš nastaviti s izvještajem o otklanjanju grešaka, odaberi \"Odustani"
-"\".\n"
+"Ako ne želiš nastaviti s izvještajem o otklanjanju grešaka, odaberi "
+"„Odustani�.\n"
 "Time na žalost onemogućuješ ispravljanje grešaka u budućnosti.\n"
 "Ako možeš, molimo te da nastaviš s izradom izvještaja.\n"
 
 #: ../src/msw/registry.cpp:1405
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
-msgstr "Zanemarivanje vrijednosti \"%s\" tipke \"%s\"."
+msgstr "Zanemarivanje vrijednosti „%s� tipke „%s�."
 
 #: ../src/common/xtistrm.cpp:295
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
@@ -4161,17 +4167,17 @@ msgstr "Nije moguće dobiti unos podređenog procesa"
 #: ../src/common/filefn.cpp:1028
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "Nije moguće dobiti dozvolu za datoteku '%s'"
+msgstr "Nije moguće dobiti dozvolu za datoteku „%s�"
 
 #: ../src/common/filefn.cpp:1042
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
-msgstr "Nije moguće prepisati datoteku '%s'"
+msgstr "Nije moguće prepisati datoteku „%s�"
 
 #: ../src/common/filefn.cpp:1097
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "Nije moguće postaviti korisni�ka prava za datoteku '%s'"
+msgstr "Nije moguće postaviti korisni�ka prava za datoteku „%s�"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:886
@@ -4224,12 +4230,12 @@ msgstr "Inicijalizacija naknadne inicijalizacije nije uspjela, prekid."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:54
 msgid "Ins"
-msgstr "Ins"
+msgstr "Umetni"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/richtext/richtextsymboldlg.cpp:472 ../src/common/accelcmn.cpp:53
 msgid "Insert"
-msgstr "Insert"
+msgstr "Umetni"
 
 #: ../src/richtext/richtextbuffer.cpp:8067
 msgid "Insert Field"
@@ -4263,7 +4269,7 @@ msgstr "Sužavanje"
 #: ../src/gtk/app.cpp:425
 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
-msgstr "Nevaljana GTK+ opcija naredbenog retka, koristi \"%s --help\""
+msgstr "Nevaljana GTK+ opcija naredbenog retka, koristi „%s --help�"
 
 #: ../src/common/imagtiff.cpp:311
 msgid "Invalid TIFF image index."
@@ -4272,22 +4278,22 @@ msgstr "Nevaljani index TIFF slike."
 #: ../src/common/appcmn.cpp:273
 #, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "Nevaljana specifikacija modusa prikaza '%s'."
+msgstr "Nevaljana specifikacija modusa prikaza „%s�."
 
 #: ../src/x11/app.cpp:127
 #, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "Nevaljana specifikacija geometrije '%s'"
+msgstr "Nevaljana specifikacija geometrije „%s�"
 
 #: ../src/unix/fswatcher_inotify.cpp:323
 #, c-format
 msgid "Invalid inotify event for \"%s\""
-msgstr "Nevaljani inotify događaj za \"%s\""
+msgstr "Nevaljani inotify događaj za „%s�"
 
 #: ../src/unix/snglinst.cpp:312
 #, c-format
 msgid "Invalid lock file '%s'."
-msgstr "Nevaljana datoteka za zaklju�avanje '%s'."
+msgstr "Nevaljana datoteka za zaklju�avanje „%s�."
 
 #: ../src/common/translation.cpp:1125
 msgid "Invalid message catalog."
@@ -4304,13 +4310,13 @@ msgstr "Nevaljani ili Null ID objekta je proslijeđen na HasObjectClassInfo"
 #: ../src/common/regex.cpp:310
 #, c-format
 msgid "Invalid regular expression '%s': %s"
-msgstr "Nevaljan regularni izraz '%s': %s"
+msgstr "Nevaljan regularni izraz „%s�: %s"
 
 #: ../src/common/config.cpp:226
 #, c-format
 msgid "Invalid value %ld for a boolean key \"%s\" in config file."
 msgstr ""
-"Nevaljana vrijedonst %ld za booleov klju� \"%s\" u konfiguracijskoj datoteci."
+"Nevaljana vrijedonst %ld za booleov klju� „%s� u konfiguracijskoj datoteci."
 
 #: ../src/generic/fontdlgg.cpp:329 ../src/richtext/richtextfontpage.cpp:351
 #: ../src/osx/carbon/fontdlg.cpp:361 ../src/common/stockitem.cpp:168
@@ -4406,122 +4412,122 @@ msgstr "KOI8-U"
 
 #: ../src/common/accelcmn.cpp:265 ../src/common/accelcmn.cpp:347
 msgid "KP_"
-msgstr "KP_"
+msgstr "BT_"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:106
 msgid "KP_Add"
-msgstr "KP_Add"
+msgstr "BT_Dodaj"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:101
 msgid "KP_Begin"
-msgstr "KP_Begin"
+msgstr "BT_Po�ni"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:109
 msgid "KP_Decimal"
-msgstr "KP_Decimal"
+msgstr "BT_Decimala"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:103
 msgid "KP_Delete"
-msgstr "KP_Delete"
+msgstr "BT_Izbriši"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:110
 msgid "KP_Divide"
-msgstr "KP_Divide"
+msgstr "BT_Dijeli"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:95
 msgid "KP_Down"
-msgstr "KP_Down"
+msgstr "BT_Dolje"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:100
 msgid "KP_End"
-msgstr "KP_End"
+msgstr "BT_Kraj"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:90
 msgid "KP_Enter"
-msgstr "KP_Enter"
+msgstr "BT_Unesi"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:104
 msgid "KP_Equal"
-msgstr "KP_Equal"
+msgstr "BT_Jednako"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:91
 msgid "KP_Home"
-msgstr "KP_Home"
+msgstr "BT_Po�etna"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:102
 msgid "KP_Insert"
-msgstr "KP_Insert"
+msgstr "BT_Umetni"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:92
 msgid "KP_Left"
-msgstr "KP_Left"
+msgstr "BT_Lijevo"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:105
 msgid "KP_Multiply"
-msgstr "KP_Multiply"
+msgstr "BT_Množi"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:99
 msgid "KP_Next"
-msgstr "KP_Next"
+msgstr "BT_Sljedeće"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:97
 msgid "KP_PageDown"
-msgstr "KP_PageDown"
+msgstr "BT_Sljedeća stranica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:96
 msgid "KP_PageUp"
-msgstr "KP_PageUp"
+msgstr "BT_Prethodna stranica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:98
 msgid "KP_Prior"
-msgstr "KP_Prior"
+msgstr "BT_Prethodno"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:94
 msgid "KP_Right"
-msgstr "KP_Right"
+msgstr "BT_Desno"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:107
 msgid "KP_Separator"
-msgstr "KP_Separator"
+msgstr "BT_Razdvojnik"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:88
 msgid "KP_Space"
-msgstr "KP_Space"
+msgstr "BT_Razmaknica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:108
 msgid "KP_Subtract"
-msgstr "KP_Subtract"
+msgstr "BT_Oduzmi"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:89
 msgid "KP_Tab"
-msgstr "KP_Tab"
+msgstr "BT_Tabulator"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:93
 msgid "KP_Up"
-msgstr "KP_Up"
+msgstr "BT_Gore"
 
 #: ../src/richtext/richtextindentspage.cpp:270
 msgid "L&ine spacing:"
@@ -4543,9 +4549,9 @@ msgstr "Zadnja stranica"
 #, c-format
 msgid "Last repeated message (\"%s\", %u time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %u times) wasn't output"
-msgstr[0] "Zadnja ponovljena poruka (\"%s\", %u puta) nije iznešena"
-msgstr[1] "Zadnja ponovljena poruka (\"%s\", %u puta) nije iznešena"
-msgstr[2] "Zadnja ponovljena poruka (\"%s\", %u puta) nije iznešena"
+msgstr[0] "Zadnja ponovljena poruka („%s�, %u puta) nije iznešena"
+msgstr[1] "Zadnja ponovljena poruka („%s�, %u puta) nije iznešena"
+msgstr[2] "Zadnja ponovljena poruka („%s�, %u puta) nije iznešena"
 
 #: ../src/common/paper.cpp:103
 msgid "Ledger, 17 x 11 in"
@@ -4562,7 +4568,7 @@ msgstr "Ledger, 17 × 11 in"
 #: ../src/richtext/richtextbulletspage.cpp:190
 #: ../src/richtext/richtextsizepage.cpp:249 ../src/common/accelcmn.cpp:61
 msgid "Left"
-msgstr "Left"
+msgstr "Lijevo"
 
 #: ../src/richtext/richtextindentspage.cpp:204
 #: ../src/richtext/richtextliststylepage.cpp:390
@@ -4636,7 +4642,7 @@ msgstr "Limun"
 #: ../src/generic/helpext.cpp:294
 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
-msgstr "%lu. redak datoteke \"%s\" ima nevaljanu sintaksu, presko�eno."
+msgstr "%lu. redak datoteke „%s� ima nevaljanu sintaksu, presko�eno."
 
 #: ../src/richtext/richtextliststylepage.cpp:444
 msgid "Line spacing:"
@@ -4644,7 +4650,7 @@ msgstr "Prored:"
 
 #: ../src/html/chm.cpp:838
 msgid "Link contained '//', converted to absolute link."
-msgstr "Poveznica je sadržavala '//'; pretvorena je u apsolutnu poveznicu."
+msgstr "Poveznica je sadržavala „//�; pretvorena je u apsolutnu poveznicu."
 
 #: ../src/richtext/richtextformatdlg.cpp:364
 msgid "List Style"
@@ -4676,17 +4682,17 @@ msgstr "U�itavanje : "
 #: ../src/unix/snglinst.cpp:246
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
-msgstr "Datoteka za zaklju�avanje '%s' ima neipravnog vlasnika."
+msgstr "Datoteka za zaklju�avanje „%s� ima neipravnog vlasnika."
 
 #: ../src/unix/snglinst.cpp:251
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
-msgstr "Datoteka za zaklju�avanje '%s' ima neipravna korisni�ka prava."
+msgstr "Datoteka za zaklju�avanje „%s� ima neipravna korisni�ka prava."
 
 #: ../src/generic/logg.cpp:576
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "Log je spremljen u datoteku '%s'."
+msgstr "Log je spremljen u datoteku „%s�."
 
 #: ../src/richtext/richtextliststylepage.cpp:484
 #: ../src/richtext/richtextbulletspage.cpp:276
@@ -4707,8 +4713,8 @@ msgid ""
 "MS HTML Help functions are unavailable because the MS HTML Help library is "
 "not installed on this machine. Please install it."
 msgstr ""
-"Funkcije za MS HTML pomoć nisu dostupne, jer biblioteka za MS HTML pomoć nije "
-"instalirana na ovom ra�unalu. Instaliraj je."
+"Funkcije za MS HTML pomoć nisu dostupne, jer biblioteka za MS HTML pomoć "
+"nije instalirana na ovom ra�unalu. Instaliraj je."
 
 #: ../src/univ/themes/win32.cpp:3754
 msgid "Ma&ximize"
@@ -4912,13 +4918,13 @@ msgstr "Greška u pokretanju medija: %s"
 #: ../src/common/fs_mem.cpp:175
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "Memorija VFS već sadržava datoteku '%s'!"
+msgstr "Memorija VFS već sadržava datoteku „%s�!"
 
 #. TRANSLATORS: Name of keyboard key
 #. TRANSLATORS: Keyword of system colour
 #: ../src/common/accelcmn.cpp:73 ../src/propgrid/advprops.cpp:889
 msgid "Menu"
-msgstr "Menu"
+msgstr "Izbornik"
 
 #: ../src/common/msgout.cpp:124
 msgid "Message"
@@ -4930,7 +4936,7 @@ msgstr "Metalna tema"
 
 #: ../src/msw/ole/automtn.cpp:652
 msgid "Method or property not found."
-msgstr "Metoda ili osobina nisu nađeni."
+msgstr "Metoda ili svojstvo nisu nađeni."
 
 #: ../src/univ/themes/win32.cpp:3752
 msgid "Mi&nimize"
@@ -4964,7 +4970,7 @@ msgstr "Izmijenjeno"
 #: ../src/common/module.cpp:133
 #, c-format
 msgid "Module \"%s\" initialization failed"
-msgstr "Inicijalizacija modula \"%s\" nije uspjela"
+msgstr "Inicijalizacija modula „%s� nije uspjela"
 
 #: ../src/common/paper.cpp:131
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
@@ -5090,8 +5096,8 @@ msgid ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""
-"Nijedan font nije nađen za prikaz teksta, kodiranog u '%s',\n"
-"no dostupno je alternativno kodiranje '%s'.\n"
+"Nijedan font nije nađen za prikaz teksta, kodiranog u „%s�,\n"
+"no dostupno je alternativno kodiranje „%s�.\n"
 "Želiš li koristiti ovo kodiranje (ina�e ćeš morati odabrati neko drugo)?"
 
 #: ../src/common/fontmap.cpp:426
@@ -5101,7 +5107,7 @@ msgid ""
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
-"Nijedan font nije nađen za prikaz teksta, kodiranog u '%s'.\n"
+"Nijedan font nije nađen za prikaz teksta, kodiranog u „%s�.\n"
 "Želiš li odabrati font za ovo kodiranje (ina�e se tekst s ovim\n"
 "kodiranjem neće pravilno prikazati)?"
 
@@ -5143,7 +5149,7 @@ msgstr "Nema nekorištenih boja u slici."
 #: ../src/generic/helpext.cpp:302
 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
-msgstr "Nije nađeno valjano mapiranje u datoteci \"%s\"."
+msgstr "Nije nađeno valjano mapiranje u datoteci „%s�."
 
 #: ../src/richtext/richtextborderspage.cpp:610
 #: ../src/richtext/richtextsizepage.cpp:248
@@ -5157,11 +5163,11 @@ msgstr "Nordic (ISO-8859-10)"
 
 #: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:331
 msgid "Normal"
-msgstr "Normalno"
+msgstr "Normalni"
 
 #: ../src/html/helpwnd.cpp:1263
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr "Normalni rez<br>i <u>podcrtano</u>. "
+msgstr "Normalni font<br>i <u>podcrtano</u>. "
 
 #: ../src/html/helpwnd.cpp:1205
 msgid "Normal font:"
@@ -5226,87 +5232,87 @@ msgstr "Num ="
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:101
 msgid "Num Begin"
-msgstr "Num Begin"
+msgstr "Num Po�ni"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:103
 msgid "Num Delete"
-msgstr "Num Delete"
+msgstr "Num Izbriši"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:95
 msgid "Num Down"
-msgstr "Num Down"
+msgstr "Num Dolje"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:100
 msgid "Num End"
-msgstr "Num End"
+msgstr "Num Kraj"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:90
 msgid "Num Enter"
-msgstr "Num Enter"
+msgstr "Num Unesi"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:91
 msgid "Num Home"
-msgstr "Num Home"
+msgstr "Num Po�etna"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:102
 msgid "Num Insert"
-msgstr "Num Insert"
+msgstr "Num Umetni"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:86
 msgid "Num Lock"
-msgstr "Num Lock"
+msgstr "Num Zaklju�aj"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:97
 msgid "Num Page Down"
-msgstr "Num Page Down"
+msgstr "Num Sljedeća stranica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:96
 msgid "Num Page Up"
-msgstr "Num Page Up"
+msgstr "Num Prethodna stranica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:94
 msgid "Num Right"
-msgstr "Num Right"
+msgstr "Num Desno"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:88
 msgid "Num Space"
-msgstr "Num Space"
+msgstr "Num Razmak"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:89
 msgid "Num Tab"
-msgstr "Num Tab"
+msgstr "Num Tabulator"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:93
 msgid "Num Up"
-msgstr "Num Up"
+msgstr "Num Gore"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:92
 msgid "Num left"
-msgstr "Num left"
+msgstr "Num Lijevo"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:86
 msgid "Num_lock"
-msgstr "Num_lock"
+msgstr "Num_zaklju�aj"
 
 #: ../src/richtext/richtextliststylepage.cpp:487
 #: ../src/richtext/richtextbulletspage.cpp:279
 msgid "Numbered outline"
-msgstr "Numerirani pregled"
+msgstr "Numerirani sadržaj"
 
 #: ../include/wx/msgdlg.h:278 ../src/richtext/richtextstyledlg.cpp:297
 #: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:454
@@ -5321,7 +5327,7 @@ msgstr "Greška OLE automatizacije u %s: %s"
 
 #: ../include/wx/richtext/richtextimagedlg.h:37
 msgid "Object Properties"
-msgstr "Osobine objekta"
+msgstr "Svojstva objekta"
 
 #: ../src/msw/ole/automtn.cpp:660
 msgid "Object implementation does not support named arguments."
@@ -5354,7 +5360,7 @@ msgstr "Otvori HTML datoteku"
 #: ../src/generic/dbgrptg.cpp:163
 #, c-format
 msgid "Open file \"%s\""
-msgstr "Otvori datoteku \"%s\""
+msgstr "Otvori datoteku „%s�"
 
 #: ../src/common/stockitem.cpp:179
 msgid "Open..."
@@ -5372,17 +5378,17 @@ msgstr "Operacija nije dozvoljena."
 #: ../src/common/cmdline.cpp:900
 #, c-format
 msgid "Option '%s' can't be negated"
-msgstr "Nije moguće negirati opciju '%s'"
+msgstr "Nije moguće negirati opciju „%s�"
 
 #: ../src/common/cmdline.cpp:1064
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "Opcija '%s' zahtijeva vrijednost."
+msgstr "Opcija „%s� zahtijeva vrijednost."
 
 #: ../src/common/cmdline.cpp:1147
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
-msgstr "Opcija '%s': Nije moguće konvertirati ’%s’ u datum."
+msgstr "Opcija „%s�: Nije moguće konvertirati ’%s’ u datum."
 
 #: ../src/generic/prntdlgg.cpp:618
 msgid "Options"
@@ -5571,7 +5577,7 @@ msgstr "%d. stranica od %d"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:58
 msgid "Page Down"
-msgstr "Page Down"
+msgstr "Sljedeća stranica"
 
 #: ../src/gtk/print.cpp:826
 msgid "Page Setup"
@@ -5580,7 +5586,7 @@ msgstr "Postavke stranice"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:57
 msgid "Page Up"
-msgstr "Page Up"
+msgstr "Prethodna stranica"
 
 #: ../src/generic/prntdlgg.cpp:828 ../src/common/prntbase.cpp:484
 msgid "Page setup"
@@ -5589,12 +5595,12 @@ msgstr "Postavke stranice"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:58
 msgid "PageDown"
-msgstr "PageDown"
+msgstr "Sljedeća stranica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:57
 msgid "PageUp"
-msgstr "PageUp"
+msgstr "Prethodna stranica"
 
 #: ../src/generic/prntdlgg.cpp:216
 msgid "Pages"
@@ -5603,7 +5609,7 @@ msgstr "Stranice"
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1765
 msgid "Paint Brush"
-msgstr "Kist za bojanje"
+msgstr "Kist za bojenje"
 
 #: ../src/generic/prntdlgg.cpp:602 ../src/generic/prntdlgg.cpp:801
 #: ../src/generic/prntdlgg.cpp:842 ../src/generic/prntdlgg.cpp:855
@@ -5635,7 +5641,7 @@ msgstr "Zalijepi odabir"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:74
 msgid "Pause"
-msgstr "Pause"
+msgstr "Pauza"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1766
@@ -5654,12 +5660,12 @@ msgstr "Korisni�ka prava"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:60
 msgid "PgDn"
-msgstr "PgDn"
+msgstr "Sljedeća stranica"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:59
 msgid "PgUp"
-msgstr "PgUp"
+msgstr "Prethodna stranica"
 
 #: ../src/richtext/richtextbuffer.cpp:12868
 msgid "Picture Properties"
@@ -5696,12 +5702,12 @@ msgstr "Pri�ekaj dok traje ispis …"
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1767
 msgid "Point Left"
-msgstr "Pokazuje lijevo"
+msgstr "Ukaži na lijevo"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1768
 msgid "Point Right"
-msgstr "Pokazuje desno"
+msgstr "Ukaži na desno"
 
 #. TRANSLATORS: Label of font point size
 #: ../src/propgrid/advprops.cpp:662
@@ -5714,7 +5720,7 @@ msgstr "Uspravno"
 
 #: ../src/richtext/richtextsizepage.cpp:496
 msgid "Position"
-msgstr "Pozicija"
+msgstr "Položaj"
 
 #: ../src/generic/prntdlgg.cpp:298
 msgid "PostScript file"
@@ -5747,7 +5753,7 @@ msgstr "Prethodna stranica"
 #: ../src/common/accelcmn.cpp:77 ../src/gtk/print.cpp:620
 #: ../src/gtk/print.cpp:638
 msgid "Print"
-msgstr "Print"
+msgstr "Ispiši"
 
 #: ../include/wx/prntbase.h:399 ../src/common/docview.cpp:1268
 msgid "Print Preview"
@@ -5865,7 +5871,7 @@ msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr ""
 "Obrada izvještaja o otklanjanju grešaka nije uspjela. Datoteke ostaju u "
-"direktoriju \"% s\"."
+"direktoriju „%s�."
 
 #: ../src/common/prntbase.cpp:545
 msgid "Progress:"
@@ -5877,12 +5883,12 @@ msgstr "Svojstva"
 
 #: ../src/propgrid/manager.cpp:237
 msgid "Property"
-msgstr "Osobina"
+msgstr "Svojstvo"
 
 #. TRANSLATORS: Caption of message box displaying any property error
 #: ../src/propgrid/propgrid.cpp:3185 ../src/propgrid/propgrid.cpp:3318
 msgid "Property Error"
-msgstr "Greška u osobini"
+msgstr "Greška svojstva"
 
 #: ../src/propgrid/advprops.cpp:1597
 msgid "Purple"
@@ -5921,12 +5927,12 @@ msgstr "RawCtrl+"
 #: ../src/common/ffile.cpp:109 ../src/common/ffile.cpp:133
 #, c-format
 msgid "Read error on file '%s'"
-msgstr "Greška u �itanju datoteke '%s'"
+msgstr "Greška u �itanju datoteke „%s�"
 
 #: ../src/common/secretstore.cpp:199
 #, c-format
 msgid "Reading password for \"%s/%s\" failed: %s."
-msgstr "ÄŒitanje lozinke za \"%s/%s\": %s."
+msgstr "Čitanje lozinke za „%s/%s�: %s."
 
 #: ../src/common/prntbase.cpp:272
 msgid "Ready"
@@ -5955,12 +5961,12 @@ msgstr "Osvježi"
 #: ../src/msw/registry.cpp:626
 #, c-format
 msgid "Registry key '%s' already exists."
-msgstr "Registarski klju� '%s' već postoji."
+msgstr "Registarski klju� „%s� već postoji."
 
 #: ../src/msw/registry.cpp:595
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "Registarski klju� '%s' ne postoji; nije ga moguće preimenovati."
+msgstr "Registarski klju� „%s� ne postoji; nije ga moguće preimenovati."
 
 #: ../src/msw/registry.cpp:727
 #, c-format
@@ -5969,29 +5975,29 @@ msgid ""
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""
-"Registarski klju� '%s' je potreban za normalan rad sustava.\n"
+"Registarski klju� „%s� je potreban za normalan rad sustava.\n"
 "Brisanjem će tvoj sustav postati nestabilan:\n"
 "operacija je prekinuta."
 
 #: ../src/msw/registry.cpp:954
 #, c-format
 msgid "Registry value \"%s\" is not binary (but of type %s)"
-msgstr "Registarska vrijednost '%s' nije binarna (ali je vrste %s)"
+msgstr "Registarska vrijednost „%s� nije binarna (ali je vrste %s)"
 
 #: ../src/msw/registry.cpp:917
 #, c-format
 msgid "Registry value \"%s\" is not numeric (but of type %s)"
-msgstr "Registarska vrijednost '%s' nije numeri�ka (ali je vrste %s)"
+msgstr "Registarska vrijednost „%s� nije numeri�ka (ali je vrste %s)"
 
 #: ../src/msw/registry.cpp:1003
 #, c-format
 msgid "Registry value \"%s\" is not text (but of type %s)"
-msgstr "Registarska vrijednost '%s' nije tekst (ali je vrste %s)"
+msgstr "Registarska vrijednost „%s� nije tekst (ali je vrste %s)"
 
 #: ../src/msw/registry.cpp:521
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "Registarska vrijednost '%s' već postoji."
+msgstr "Registarska vrijednost „%s� već postoji."
 
 #: ../src/richtext/richtextfontpage.cpp:350
 #: ../src/richtext/richtextfontpage.cpp:354
@@ -6026,7 +6032,7 @@ msgstr "Ukloni trenuta�nu stranicu iz knjižnih oznaka"
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr ""
-"Iscrta� \"%s\" ima nekompatibilnu verziju %d.%d i nije ga moguće u�itati."
+"Iscrta� „%s� ima nekompatibilnu verziju %d.%d i nije ga moguće u�itati."
 
 #: ../src/richtext/richtextbuffer.cpp:4527
 msgid "Renumber List"
@@ -6059,12 +6065,12 @@ msgstr "Obavezan unos informacija je prazan."
 #: ../src/common/translation.cpp:1975
 #, c-format
 msgid "Resource '%s' is not a valid message catalog."
-msgstr "Resurs '%s' nije valjani katalog obavijesti."
+msgstr "Resurs „%s� nije valjani katalog obavijesti."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:56
 msgid "Return"
-msgstr "Return"
+msgstr "Potvrdi"
 
 #: ../src/common/stockitem.cpp:189
 msgid "Revert to Saved"
@@ -6085,7 +6091,7 @@ msgstr "Desn&o-Lijevo"
 #: ../src/richtext/richtextbulletspage.cpp:188
 #: ../src/richtext/richtextsizepage.cpp:250 ../src/common/accelcmn.cpp:62
 msgid "Right"
-msgstr "Right"
+msgstr "Desno"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1754
@@ -6110,7 +6116,7 @@ msgstr "Poravnaj tekst u desno."
 
 #: ../src/generic/fontdlgg.cpp:322
 msgid "Roman"
-msgstr "Roman"
+msgstr "Serifni"
 
 #: ../src/generic/datavgen.cpp:5916
 #, c-format
@@ -6162,7 +6168,7 @@ msgstr "Spremi log-sadržaj u datoteku"
 #: ../src/common/secretstore.cpp:179
 #, c-format
 msgid "Saving password for \"%s/%s\" failed: %s."
-msgstr "Spremanje lozinke za \"%s/%s\": %s."
+msgstr "Spremanje lozinke za „%s/%s�: %s."
 
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Script"
@@ -6171,17 +6177,17 @@ msgstr "Pismo"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:87
 msgid "Scroll Lock"
-msgstr "Scroll Lock"
+msgstr "Zaklju�avanje kliza�a"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:87
 msgid "Scroll_lock"
-msgstr "Scroll_lock"
+msgstr "Zaklju�avanje kliza�a"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:890
 msgid "Scrollbar"
-msgstr "Scrollbar"
+msgstr "Traka kliza�a"
 
 #: ../src/generic/srchctlg.cpp:56 ../src/html/helpwnd.cpp:535
 #: ../src/html/helpwnd.cpp:550
@@ -6219,17 +6225,17 @@ msgstr "Odjeljci"
 #: ../src/common/ffile.cpp:238
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "Traži grešku u datoteci '%s'"
+msgstr "Traži grešku u datoteci „%s�"
 
 #: ../src/common/ffile.cpp:228
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
-msgstr "Traži grešku u datoteci '%s' (stdio ne podržava velike datoteke)"
+msgstr "Traži grešku u datoteci „%s� (stdio ne podržava velike datoteke)"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:76
 msgid "Select"
-msgstr "Select"
+msgstr "Odaberi"
 
 #: ../src/richtext/richtextctrl.cpp:337 ../src/osx/textctrl_osx.cpp:581
 #: ../src/common/stockitem.cpp:192 ../src/msw/textctrl.cpp:2512
@@ -6275,12 +6281,12 @@ msgstr "Odabire razinu popisa za uređivanje."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:82
 msgid "Separator"
-msgstr "Separator"
+msgstr "Razdvojnik"
 
 #: ../src/common/cmdline.cpp:1083
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "Potreban je razdvojnik nakon opcije '%s'."
+msgstr "Potreban je razdvojnik nakon opcije „%s�."
 
 #: ../src/osx/menu_osx.cpp:572
 msgid "Services"
@@ -6438,7 +6444,7 @@ msgstr "Kapitalke"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:79
 msgid "Snapshot"
-msgstr "Snapshot"
+msgstr "Snimka zaslona"
 
 #: ../src/richtext/richtextborderspage.cpp:611
 msgid "Solid"
@@ -6471,12 +6477,12 @@ msgstr "Zvukovni podaci imaju nepodržani format."
 #: ../src/unix/sound.cpp:477
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
-msgstr "Zvukovna datoteka '%s' ima nepodržani format."
+msgstr "Zvukovna datoteka „%s� ima nepodržani format."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:67
 msgid "Space"
-msgstr "Space"
+msgstr "Razmaknica"
 
 #: ../src/richtext/richtextliststylepage.cpp:467
 msgid "Spacing"
@@ -6489,7 +6495,7 @@ msgstr "Provjera pravopisa"
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1776
 msgid "Spraycan"
-msgstr "Sprej limenka"
+msgstr "Sprej-limenka"
 
 #: ../src/richtext/richtextliststylepage.cpp:490
 #: ../src/richtext/richtextbulletspage.cpp:282
@@ -6542,7 +6548,7 @@ msgstr "Spuš&teno"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:83
 msgid "Subtract"
-msgstr "Subtract"
+msgstr "Oduzmi"
 
 #: ../src/richtext/richtextfontpage.cpp:296
 msgid "Supe&rscript"
@@ -6606,7 +6612,7 @@ msgstr "TIFF: Slika je abnormalno velika."
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:68
 msgid "Tab"
-msgstr "Tab"
+msgstr "Tabulator"
 
 #: ../src/richtext/richtextbuffer.cpp:11498
 msgid "Table Properties"
@@ -6699,7 +6705,7 @@ msgstr "Veli�ina donjeg odmaka."
 #: ../src/richtext/richtextsizepage.cpp:653
 #: ../src/richtext/richtextsizepage.cpp:655
 msgid "The bottom position."
-msgstr "Doljnja pozicija."
+msgstr "Donji položaj."
 
 #: ../src/richtext/richtextliststylepage.cpp:254
 #: ../src/richtext/richtextliststylepage.cpp:256
@@ -6715,7 +6721,7 @@ msgstr "Znak nabrajanja."
 #: ../src/richtext/richtextsymboldlg.cpp:443
 #: ../src/richtext/richtextsymboldlg.cpp:445
 msgid "The character code."
-msgstr "Å ifra znaka."
+msgstr "K�d slovnog znaka."
 
 #: ../src/common/fontmap.cpp:203
 #, c-format
@@ -6724,14 +6730,14 @@ msgid ""
 "another charset to replace it with or choose\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""
-"Kodna stranica '%s' nije poznata. Možeš odabrati\n"
+"Kodna stranica „%s� nije poznata. Možeš odabrati\n"
 "neku drugu kodnu stranicu kao zamjenu ili\n"
 "[Odustani] ako izmjena nije moguća"
 
 #: ../src/msw/ole/dataobj.cpp:394
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "Format međuspremnika '%d' ne postoji."
+msgstr "Format međuspremnika „%d� ne postoji."
 
 #: ../src/richtext/richtextstylepage.cpp:130
 #: ../src/richtext/richtextstylepage.cpp:132
@@ -6744,7 +6750,7 @@ msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
-"Mapa '%s' ne postoji.\n"
+"Mapa „%s� ne postoji.\n"
 "Želiš li je sada stvoriti?"
 
 #: ../src/html/htmprint.cpp:271
@@ -6755,7 +6761,7 @@ msgid ""
 "\n"
 "Would you like to proceed with printing it nevertheless?"
 msgstr ""
-"Dokument \"%s\" ne paše na stranicu vodoravno, te će biti odrezana u ispisu.\n"
+"Dokument „%s� ne paše na stranicu vodoravno, te će biti odrezana u ispisu.\n"
 "\n"
 "Želiš li ipak nastaviti s ispisom?"
 
@@ -6765,7 +6771,7 @@ msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 "It has been removed from the most recently used files list."
 msgstr ""
-"Datoteka '%s' ne postoji i ne može se otvoriti.\n"
+"Datoteka „%s� ne postoji i ne može se otvoriti.\n"
 "Uklonjena je iz popisa nedavno otvorenih datoteka."
 
 #: ../src/richtext/richtextindentspage.cpp:208
@@ -6773,7 +6779,7 @@ msgstr ""
 #: ../src/richtext/richtextliststylepage.cpp:394
 #: ../src/richtext/richtextliststylepage.cpp:396
 msgid "The first line indent."
-msgstr "Uvlaka prvog retka."
+msgstr "Uvlaka za prvi redak."
 
 #: ../src/gtk/utilsgtk.cpp:481
 msgid "The following standard GTK+ options are also supported:\n"
@@ -6785,7 +6791,7 @@ msgstr "Boja fonta."
 
 #: ../src/generic/fontdlgg.cpp:375 ../src/generic/fontdlgg.cpp:377
 msgid "The font family."
-msgstr "Font obitelj."
+msgstr "Obitelj fontova."
 
 #: ../src/richtext/richtextsymboldlg.cpp:405
 #: ../src/richtext/richtextsymboldlg.cpp:407
@@ -6817,7 +6823,7 @@ msgstr "Rez fonta."
 #: ../src/common/docview.cpp:1483
 #, c-format
 msgid "The format of file '%s' couldn't be determined."
-msgstr "Format datoteke '%s' nije bilo moguće ustanoviti."
+msgstr "Format datoteke „%s� nije bilo moguće ustanoviti."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:219
 #: ../src/richtext/richtextbackgroundpage.cpp:221
@@ -6846,7 +6852,7 @@ msgstr "Veli�ina lijevog odmaka."
 #: ../src/richtext/richtextsizepage.cpp:548
 #: ../src/richtext/richtextsizepage.cpp:550
 msgid "The left position."
-msgstr "Lijeva pozicija."
+msgstr "Lijevi položaj."
 
 #: ../src/richtext/richtextindentspage.cpp:288
 #: ../src/richtext/richtextindentspage.cpp:290
@@ -6897,7 +6903,7 @@ msgstr "Å irina objekta."
 #: ../src/richtext/richtextindentspage.cpp:227
 #: ../src/richtext/richtextindentspage.cpp:229
 msgid "The outline level."
-msgstr "Razina pregleda."
+msgstr "Razina sadržaja."
 
 #: ../src/common/log.cpp:277
 #, c-format
@@ -6929,7 +6935,7 @@ msgstr ""
 #: ../src/common/cmdline.cpp:1254
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "Obavezan parametar '%s' nije bio određen."
+msgstr "Obavezan parametar „%s� nije bio određen."
 
 #: ../src/richtext/richtextindentspage.cpp:217
 #: ../src/richtext/richtextindentspage.cpp:219
@@ -6953,7 +6959,7 @@ msgstr "Veli�ina desnog odmaka."
 #: ../src/richtext/richtextsizepage.cpp:618
 #: ../src/richtext/richtextsizepage.cpp:620
 msgid "The right position."
-msgstr "Desna pozicija."
+msgstr "Desni položaj."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:309
 #: ../src/richtext/richtextbackgroundpage.cpp:311
@@ -7010,11 +7016,11 @@ msgstr "Sustav ne može naći određenu datoteku."
 #: ../src/richtext/richtexttabspage.cpp:114
 #: ../src/richtext/richtexttabspage.cpp:116
 msgid "The tab position."
-msgstr "Pozicija tabulatora."
+msgstr "Položaj tabulatora."
 
 #: ../src/richtext/richtexttabspage.cpp:120
 msgid "The tab positions."
-msgstr "Pozicije tabulatora."
+msgstr "Položaji tabulatora."
 
 #: ../src/richtext/richtextctrl.cpp:3098
 msgid "The text couldn't be saved."
@@ -7035,12 +7041,12 @@ msgstr "Veli�ina gornjeg odmaka."
 #: ../src/richtext/richtextsizepage.cpp:583
 #: ../src/richtext/richtextsizepage.cpp:585
 msgid "The top position."
-msgstr "Gornja pozicija."
+msgstr "Gornji položaj."
 
 #: ../src/common/cmdline.cpp:1232
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "Vrijednost opcije '%s' mora biti određena."
+msgstr "Vrijednost opcije „%s� mora biti određena."
 
 #: ../src/richtext/richtextborderspage.cpp:585
 #: ../src/richtext/richtextborderspage.cpp:587
@@ -7053,8 +7059,8 @@ msgid ""
 "The version of remote access service (RAS) installed on this machine is too "
 "old, please upgrade (the following required function is missing: %s)."
 msgstr ""
-"Na ovom ra�unalu instalirana verzija usluge daljninskog pristupa (RAS) je pre "
-"stara, nadogradi je (nedostaje potrebna funkcija: %s)."
+"Na ovom ra�unalu instalirana verzija usluge daljninskog pristupa (RAS) je "
+"pre stara, nadogradi je (nedostaje potrebna funkcija: %s)."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:242
 #: ../src/richtext/richtextbackgroundpage.cpp:244
@@ -7070,8 +7076,8 @@ msgstr ""
 
 #: ../src/html/htmprint.cpp:255
 msgid ""
-"This document doesn't fit on the page horizontally and will be truncated when "
-"it is printed."
+"This document doesn't fit on the page horizontally and will be truncated "
+"when it is printed."
 msgstr ""
 "Ovaj dokument ne paše na stranicu vodoravno, te će biti odrezana u ispisu."
 
@@ -7086,8 +7092,8 @@ msgstr "Platforma ne podržava neprozirnost pozadine."
 
 #: ../src/gtk/window.cpp:4660
 msgid ""
-"This program was compiled with a too old version of GTK+, please rebuild with "
-"GTK+ 2.12 or newer."
+"This program was compiled with a too old version of GTK+, please rebuild "
+"with GTK+ 2.12 or newer."
 msgstr ""
 "Ovaj je program kompiliran s pre starom verzijom GTK+, ponovo izgradi s GTK+ "
 "2.12 ili novijom verzijom."
@@ -7097,8 +7103,8 @@ msgid ""
 "Thread module initialization failed: cannot store value in thread local "
 "storage"
 msgstr ""
-"Inicijalizacija modula tijeka nije uspjela: nije moguće spremiti vrijednost u "
-"tijek lokalnog spremišta"
+"Inicijalizacija modula tijeka nije uspjela: nije moguće spremiti vrijednost "
+"u tijek lokalnog spremišta"
 
 #: ../src/unix/threadpsx.cpp:1794
 msgid "Thread module initialization failed: failed to create thread key"
@@ -7150,12 +7156,12 @@ msgstr "Previše EndStyle poziva!"
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:891
 msgid "Tooltip"
-msgstr "Tooltip"
+msgstr "Savjetni obla�ić"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:892
 msgid "TooltipText"
-msgstr "TooltipText"
+msgstr "Tekst u savjetnom obla�iću"
 
 #: ../src/richtext/richtextsizepage.cpp:286
 #: ../src/richtext/richtextsizepage.cpp:290 ../src/common/stockitem.cpp:200
@@ -7168,7 +7174,7 @@ msgstr "Gornja margina (mm):"
 
 #: ../src/generic/aboutdlgg.cpp:79
 msgid "Translations by "
-msgstr "Prijevodi od "
+msgstr "Prevoditelji "
 
 #: ../src/generic/aboutdlgg.cpp:188
 msgid "Translators"
@@ -7182,7 +7188,7 @@ msgstr "To�no"
 #: ../src/common/fs_mem.cpp:227
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "Pokušaj uklanjanja datoteke '%s' iz memorije VFS, ali nije u�itana!"
+msgstr "Pokušaj uklanjanja datoteke „%s� iz memorije VFS, ali nije u�itana!"
 
 #: ../src/common/fmapbase.cpp:156
 msgid "Turkish (ISO-8859-9)"
@@ -7195,7 +7201,7 @@ msgstr "Vrsta"
 #: ../src/richtext/richtextfontpage.cpp:151
 #: ../src/richtext/richtextfontpage.cpp:153
 msgid "Type a font name."
-msgstr "Upiši ime konta."
+msgstr "Upiši ime fonta."
 
 #: ../src/richtext/richtextfontpage.cpp:166
 #: ../src/richtext/richtextfontpage.cpp:168
@@ -7218,8 +7224,8 @@ msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
-"Operacija vrste \"%s\" nije uspjela: Osobina s oznakom \"%s\" je vrste \"%s"
-"\", NE \"%s\"."
+"Operacija vrste „%s� nije uspjela: Svojstvo s oznakom „%s� je vrste „%s�, NE "
+"„%s�."
 
 #: ../src/common/paper.cpp:133
 msgid "US Std Fanfold, 14 7/8 x 11 in"
@@ -7252,12 +7258,12 @@ msgstr "Nije moguće zatvoriti inotify instancu"
 #: ../include/wx/unix/private/fswatcher_kqueue.h:74
 #, c-format
 msgid "Unable to close path '%s'"
-msgstr "Nije moguće zatvoriti stazu '%s'"
+msgstr "Nije moguće zatvoriti stazu „%s�"
 
 #: ../include/wx/msw/private/fswatcher.h:48
 #, c-format
 msgid "Unable to close the handle for '%s'"
-msgstr "Nije moguće zatvoriti upravlja� za '%s'"
+msgstr "Nije moguće zatvoriti upravlja� za „%s�"
 
 #: ../include/wx/msw/private/fswatcher.h:273
 msgid "Unable to create I/O completion port"
@@ -7290,7 +7296,7 @@ msgstr "Nije moguće inicijalizirati GTK+, je li DISPLAY ispravno postavljen?"
 #: ../include/wx/unix/private/fswatcher_kqueue.h:57
 #, c-format
 msgid "Unable to open path '%s'"
-msgstr "Nije moguće otvoriti stazu '%s'"
+msgstr "Nije moguće otvoriti stazu „%s�"
 
 #: ../src/html/htmlwin.cpp:583
 #, c-format
@@ -7321,7 +7327,7 @@ msgstr "Nije moguće ukloniti kqueue nadzor"
 #: ../src/msw/fswatcher.cpp:168
 #, c-format
 msgid "Unable to set up watch for '%s'"
-msgstr "Nije moguće postaviti sat za '%s'"
+msgstr "Nije moguće postaviti sat za „%s�"
 
 #: ../src/msw/fswatcher.cpp:91
 msgid "Unable to start IOCP worker thread"
@@ -7352,17 +7358,17 @@ msgstr "Poništi posljednju radnju"
 #: ../src/common/cmdline.cpp:1029
 #, c-format
 msgid "Unexpected characters following option '%s'."
-msgstr "Neo�ekivani znakovi slijede opciju '%s'."
+msgstr "Neo�ekivani znakovi slijede opciju „%s�."
 
 #: ../src/unix/fswatcher_inotify.cpp:274
 #, c-format
 msgid "Unexpected event for \"%s\": no matching watch descriptor."
-msgstr "Neo�ekivani događaj za \"%s\": nema poklapajućih nadzornih opisnika."
+msgstr "Neo�ekivani događaj za „%s�: nema poklapajućih nadzornih opisnika."
 
 #: ../src/common/cmdline.cpp:1195
 #, c-format
 msgid "Unexpected parameter '%s'"
-msgstr "Neo�ekivani parametar '%s'"
+msgstr "Neo�ekivani parametar „%s�"
 
 #: ../include/wx/msw/private/fswatcher.h:148
 msgid "Unexpectedly new I/O completion port was created"
@@ -7437,7 +7443,7 @@ msgstr "Jedinice za debljinu donjeg odmaka."
 #: ../src/richtext/richtextsizepage.cpp:664
 #: ../src/richtext/richtextsizepage.cpp:666
 msgid "Units for the bottom position."
-msgstr "Jedinice za donju poziciju."
+msgstr "Jedinice za donji položaj."
 
 #: ../src/richtext/richtextborderspage.cpp:596
 #: ../src/richtext/richtextborderspage.cpp:598
@@ -7467,7 +7473,7 @@ msgstr "Jedinice za debljinu lijevog odmaka."
 #: ../src/richtext/richtextsizepage.cpp:559
 #: ../src/richtext/richtextsizepage.cpp:561
 msgid "Units for the left position."
-msgstr "Jedinice za lijevu poziciju."
+msgstr "Jedinice za lijevi položaj."
 
 #: ../src/richtext/richtextsizepage.cpp:485
 #: ../src/richtext/richtextsizepage.cpp:487
@@ -7522,7 +7528,7 @@ msgstr "Jedinice za debljinu desnog odmaka."
 #: ../src/richtext/richtextsizepage.cpp:629
 #: ../src/richtext/richtextsizepage.cpp:631
 msgid "Units for the right position."
-msgstr "Jedinice za desnu poziciju."
+msgstr "Jedinice za desni položaj."
 
 #: ../src/richtext/richtextborderspage.cpp:326
 #: ../src/richtext/richtextborderspage.cpp:328
@@ -7547,7 +7553,7 @@ msgstr "Jedinice za debljinu gornjeg odmaka."
 #: ../src/richtext/richtextsizepage.cpp:594
 #: ../src/richtext/richtextsizepage.cpp:596
 msgid "Units for the top position."
-msgstr "Jedinice za gornju poziciju."
+msgstr "Jedinice za gornji položaj."
 
 #: ../src/richtext/richtextbackgroundpage.cpp:230
 #: ../src/richtext/richtextbackgroundpage.cpp:232
@@ -7581,7 +7587,7 @@ msgstr "Nepoznata PNG jedinica rezolucije %d"
 #: ../src/common/xtixml.cpp:327
 #, c-format
 msgid "Unknown Property %s"
-msgstr "Nepoznata osobina %s"
+msgstr "Nepoznato svojstvo %s"
 
 #: ../src/common/imagtiff.cpp:529
 #, c-format
@@ -7613,7 +7619,7 @@ msgstr "Nepoznati format slikovnih podataka."
 #: ../src/common/cmdline.cpp:914
 #, c-format
 msgid "Unknown long option '%s'"
-msgstr "Nepoznata duga�ka opcija '%s'"
+msgstr "Nepoznata duga�ka opcija „%s�"
 
 #: ../src/msw/ole/automtn.cpp:631
 msgid "Unknown name or named argument."
@@ -7622,12 +7628,12 @@ msgstr "Nepoznato ime ili imenovani argument."
 #: ../src/common/cmdline.cpp:929 ../src/common/cmdline.cpp:951
 #, c-format
 msgid "Unknown option '%s'"
-msgstr "Nepoznata opcija '%s'"
+msgstr "Nepoznata opcija „%s�"
 
 #: ../src/common/mimecmn.cpp:225
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "Nezatvorena '{' u jednom unosu za mime vrstu %s."
+msgstr "Nezatvorena „{� u jednom unosu za mime vrstu %s."
 
 #: ../src/common/cmdproc.cpp:262 ../src/common/cmdproc.cpp:288
 #: ../src/common/cmdproc.cpp:308
@@ -7646,13 +7652,13 @@ msgstr "Nepodržani format međuspremnika."
 #: ../src/common/appcmn.cpp:256
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "Nepodržana tema '%s'."
+msgstr "Nepodržana tema „%s�."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/generic/fdrepdlg.cpp:152 ../src/common/stockitem.cpp:205
 #: ../src/common/accelcmn.cpp:63
 msgid "Up"
-msgstr "Up"
+msgstr "Gore"
 
 #: ../src/richtext/richtextliststylepage.cpp:483
 #: ../src/richtext/richtextbulletspage.cpp:275
@@ -7764,7 +7770,7 @@ msgstr "Zapadnoeuropski s eurom (ISO 8859-15)"
 
 #: ../src/generic/fontdlgg.cpp:446 ../src/generic/fontdlgg.cpp:448
 msgid "Whether the font is underlined."
-msgstr "Da li je font podcrtan."
+msgstr "Je li font podcrtan."
 
 #: ../src/propgrid/advprops.cpp:1611
 msgid "White"
@@ -7790,12 +7796,12 @@ msgstr "Window"
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:894
 msgid "WindowFrame"
-msgstr "WindowFrame"
+msgstr "Okvir prozora"
 
 #. TRANSLATORS: Keyword of system colour
 #: ../src/propgrid/advprops.cpp:895
 msgid "WindowText"
-msgstr "WindowText"
+msgstr "Tekst prozora"
 
 #: ../src/common/fmapbase.cpp:177
 msgid "Windows Arabic (CP 1256)"
@@ -7868,27 +7874,27 @@ msgstr "Windows/DOS OEM ćirilica (CP 866)"
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:111
 msgid "Windows_Left"
-msgstr "Windows_Left"
+msgstr "Windows_Lijevo"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:113
 msgid "Windows_Menu"
-msgstr "Windows_Menu"
+msgstr "Windows_Izbornik"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:112
 msgid "Windows_Right"
-msgstr "Windows_Right"
+msgstr "Windows_Desno"
 
 #: ../src/common/ffile.cpp:150
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "Zapiši grešku za datoteku '%s'"
+msgstr "Zapiši grešku za datoteku „%s�"
 
 #: ../src/xml/xml.cpp:914
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "Greška u XML obradi: '%s' u retku br. %d"
+msgstr "Greška u XML obradi: „%s� u retku br. %d"
 
 #: ../src/common/xpmdecod.cpp:796
 msgid "XPM: Malformed pixel data!"
@@ -7906,7 +7912,7 @@ msgstr "XPM: neispravan format zaglavlja!"
 #: ../src/common/xpmdecod.cpp:716 ../src/common/xpmdecod.cpp:725
 #, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
-msgstr "XPM: nepravilna definicija boje '%s' u retku br. %d!"
+msgstr "XPM: nepravilna definicija boje „%s� u retku br. %d!"
 
 #: ../src/common/xpmdecod.cpp:755
 msgid "XPM: no colors left to use for mask!"
@@ -7969,7 +7975,7 @@ msgstr "Prilagodi zumiranje"
 
 #: ../src/msw/dde.cpp:1141
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "DDEML aplikacija je stvorila produljeno stanje."
+msgstr "jedna DDEML aplikacija je stvorila produljeno stanje."
 
 #: ../src/msw/dde.cpp:1129
 msgid ""
@@ -7978,9 +7984,10 @@ msgid ""
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
-"DDEML funkcija je pozvana bez prethodnog pozivanja funkcije DdeInitialize,\n"
-"ili nevažeći identifikator instance\n"
-"je proslijeđen DDEML funkciji."
+"jedna DDEML funkcija je pozvana bez prethodnog pozivanja funkcije "
+"DdeInitialize,\n"
+"ili je jedan nevažeći identifikator instance\n"
+"proslijeđen DDEML funkciji."
 
 #: ../src/msw/dde.cpp:1147
 msgid "a client's attempt to establish a conversation has failed."
@@ -7988,7 +7995,7 @@ msgstr "pokušaj klijenta da uspostavi razgovor nije uspjeo."
 
 #: ../src/msw/dde.cpp:1144
 msgid "a memory allocation failed."
-msgstr "alokacija memorije nije uspjela."
+msgstr "alocijranje memorije nije uspjelo."
 
 #: ../src/msw/dde.cpp:1138
 msgid "a parameter failed to be validated by the DDEML."
@@ -8069,19 +8076,19 @@ msgstr "pod pretpostavkom da se radi o višedjelnom lan�anom zipu"
 #: ../src/common/fileconf.cpp:1847
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
-msgstr "pokušaj mijenjanja nepromjenljivog klju�a '%s' je zanemaren."
+msgstr "pokušaj mijenjanja nepromjenljivog klju�a „%s� je zanemaren."
 
 #: ../src/html/chm.cpp:329
 msgid "bad arguments to library function"
-msgstr "loši argumenti za funkciju biblioteke"
+msgstr "neispravni argumenti za funkciju biblioteke"
 
 #: ../src/html/chm.cpp:341
 msgid "bad signature"
-msgstr "loša signatura"
+msgstr "neispravna signatura"
 
 #: ../src/common/zipstrm.cpp:1918
 msgid "bad zipfile offset to entry"
-msgstr "loš odmak zip datoteke na unos"
+msgstr "neispravni odmak zip datoteke na unos"
 
 #: ../src/common/ftp.cpp:403
 msgid "binary"
@@ -8099,7 +8106,7 @@ msgstr "gradnja %lu"
 #: ../src/common/ffile.cpp:75
 #, c-format
 msgid "can't close file '%s'"
-msgstr "nije moguće zatvoriti datoteku '%s'"
+msgstr "nije moguće zatvoriti datoteku „%s�"
 
 #: ../src/common/file.cpp:245
 #, c-format
@@ -8109,17 +8116,17 @@ msgstr "nije moguće zatvoriti desriptora datoteka %d"
 #: ../src/common/file.cpp:586
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "nije moguće potvrditi promjene za datoteku '%s'"
+msgstr "nije moguće potvrditi promjene za datoteku „%s�"
 
 #: ../src/common/file.cpp:178
 #, c-format
 msgid "can't create file '%s'"
-msgstr "nije moguće stvoriti datoteku '%s'"
+msgstr "nije moguće stvoriti datoteku „%s�"
 
 #: ../src/common/fileconf.cpp:1141
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "nije moguće izbrisati datoteku konfiguracije '%s'"
+msgstr "nije moguće izbrisati datoteku konfiguracije „%s�"
 
 #: ../src/common/file.cpp:495
 #, c-format
@@ -8156,17 +8163,17 @@ msgstr "nije moguće u�itavanje fontova, prekida se"
 #: ../src/common/file.cpp:231 ../src/common/ffile.cpp:59
 #, c-format
 msgid "can't open file '%s'"
-msgstr "nije moguće otvoriti datoteku '%s'"
+msgstr "nije moguće otvoriti datoteku „%s�"
 
 #: ../src/common/fileconf.cpp:320
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "nije moguće otvoriti datoteku globalne konfiguracije '%s'."
+msgstr "nije moguće otvoriti datoteku globalne konfiguracije „%s�."
 
 #: ../src/common/fileconf.cpp:336
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "nije moguće otvoriti datoteku korisni�ke konfiguracije '%s'."
+msgstr "nije moguće otvoriti datoteku korisni�ke konfiguracije „%s�."
 
 #: ../src/common/fileconf.cpp:986
 msgid "can't open user configuration file."
@@ -8188,12 +8195,12 @@ msgstr "nije moguće �itanje iz deskriptora datoteka %d"
 #: ../src/common/file.cpp:581
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "nije moguće ukloniti datoteku '%s'"
+msgstr "nije moguće ukloniti datoteku „%s�"
 
 #: ../src/common/file.cpp:598
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "nije moguće ukloniti privremenu datoteku '%s'"
+msgstr "nije moguće ukloniti privremenu datoteku „%s�"
 
 #: ../src/common/file.cpp:408
 #, c-format
@@ -8203,7 +8210,7 @@ msgstr "nije moguće traženje na deskriptor datoteka %d"
 #: ../src/common/textfile.cpp:273
 #, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "nije moguće zapisivanje međuspremnika \"%s\" na disk."
+msgstr "nije moguće zapisivanje međuspremnika „%s� na disk."
 
 #: ../src/common/file.cpp:323
 #, c-format
@@ -8308,7 +8315,7 @@ msgstr "jedanaesti"
 #: ../src/common/fileconf.cpp:1833
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
-msgstr "unos '%s' se pojavljuje višestruko u grupi '%s'"
+msgstr "unos „%s� se pojavljuje višestruko u grupi „%s�"
 
 #: ../src/html/chm.cpp:343
 msgid "error in data format"
@@ -8329,7 +8336,7 @@ msgstr "greška prilikom �itanja lokalnog zaglavlja zip-a"
 #: ../src/common/zipstrm.cpp:2531
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
-msgstr "greška prilikom zapisivanja zip unosa '%s': krivi izvor ili duljina"
+msgstr "greška prilikom zapisivanja zip unosa „%s�: krivi izvor ili duljina"
 
 #: ../src/common/ffile.cpp:188
 #, c-format
@@ -8352,28 +8359,29 @@ msgstr "peti"
 #: ../src/common/fileconf.cpp:579
 #, c-format
 msgid "file '%s', line %zu: '%s' ignored after group header."
-msgstr "datoteka '%s', redak %zu: '%s' zanemareno nakon zaglavlja grupe."
+msgstr "datoteka „%s�, redak %zu: „%s� zanemareno nakon zaglavlja grupe."
 
 #: ../src/common/fileconf.cpp:608
 #, c-format
 msgid "file '%s', line %zu: '=' expected."
-msgstr "datoteka '%s', redak %zu: '=' o�ekivano."
+msgstr "datoteka „%s�, redak %zu: „=� o�ekivano."
 
 #: ../src/common/fileconf.cpp:631
 #, c-format
 msgid "file '%s', line %zu: key '%s' was first found at line %d."
-msgstr "datoteka '%s', redak %zu: klju� '%s' je najprije nađen u %d. retku."
+msgstr "datoteka „%s�, redak %zu: klju� „%s� je najprije nađen u %d. retku."
 
 #: ../src/common/fileconf.cpp:621
 #, c-format
 msgid "file '%s', line %zu: value for immutable key '%s' ignored."
 msgstr ""
-"datoteka '%s', redak %zu: vrijednost nepromijenjivog klju�a '%s' je zanemaren."
+"datoteka „%s�, redak %zu: vrijednost nepromijenjivog klju�a „%s� je "
+"zanemaren."
 
 #: ../src/common/fileconf.cpp:543
 #, c-format
 msgid "file '%s': unexpected character %c at line %zu."
-msgstr "datoteka '%s': neo�evani znak %c u %zu. retku."
+msgstr "datoteka „%s�: neo�evani znak %c u %zu. retku."
 
 #: ../src/richtext/richtextbuffer.cpp:8738
 msgid "files"
@@ -8439,7 +8447,7 @@ msgstr "svijetli"
 #: ../src/common/intl.cpp:303
 #, c-format
 msgid "locale '%s' cannot be set."
-msgstr "lokalizaciju '%s' nije moguće postaviti."
+msgstr "lokalizaciju „%s� nije moguće postaviti."
 
 #: ../src/common/datetimefmt.cpp:2125
 msgid "midnight"
@@ -8484,7 +8492,7 @@ msgstr "num"
 
 #: ../src/common/xtixml.cpp:259
 msgid "objects cannot have XML Text Nodes"
-msgstr "objekti ne mogu imati XML tekstovne �vorove"
+msgstr "objekti ne mogu imati XML tekstualne �vorove"
 
 #: ../src/html/chm.cpp:339
 msgid "out of memory"
@@ -8665,7 +8673,7 @@ msgstr "Å¡esti"
 
 #: ../src/common/appcmn.cpp:234
 msgid "specify display mode to use (e.g. 640x480-16)"
-msgstr "odredi prikazni modus, koja će se koristiti (npr.. 640x480-16)"
+msgstr "odredi modus zaslona, koja će se koristiti (npr. 640×480-16)"
 
 #: ../src/common/appcmn.cpp:220
 msgid "specify the theme to use"
@@ -8735,7 +8743,7 @@ msgstr "sutra"
 #: ../src/common/fileconf.cpp:1944
 #, c-format
 msgid "trailing backslash ignored in '%s'"
-msgstr "prateća obrnuta kosa crta je zanemarena u '%s'"
+msgstr "prateća obrnuta kosa crta je zanemarena u „%s�"
 
 #: ../src/gtk/aboutdlg.cpp:218
 msgid "translator-credits"
@@ -8771,7 +8779,7 @@ msgstr "neodređeno"
 #: ../src/common/fileconf.cpp:1979
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
-msgstr "neo�ekivani \" na poziciji %d u '%s'."
+msgstr "neo�ekivani \" na poziciji %d u „%s�."
 
 #: ../src/common/tarstrm.cpp:1045
 msgid "unexpected end of file"
@@ -8822,7 +8830,7 @@ msgstr "nepodržana metoda Zip kompresije"
 #: ../src/common/translation.cpp:1892
 #, c-format
 msgid "using catalog '%s' from '%s'."
-msgstr "koristi se katalog '%s' od '%s'."
+msgstr "koristi se katalog „%s� od „%s�."
 
 #: ../src/html/chm.cpp:335
 msgid "write error"
@@ -8830,16 +8838,16 @@ msgstr "greška u pisanju"
 
 #: ../src/common/time.cpp:292
 msgid "wxGetTimeOfDay failed."
-msgstr "wxGetTimeOfDay."
+msgstr "wxGetTimeOfDay nije uspjelo."
 
 #: ../src/motif/app.cpp:242
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
-msgstr "wxWidgets nisu mogli otvoriti zaslon za '%s': izlaženje."
+msgstr "wxWidgets nije uspio otvoriti zaslon za „%s�: prekid."
 
 #: ../src/x11/app.cpp:170
 msgid "wxWidgets could not open display. Exiting."
-msgstr "wxWidgets nisu mogli otvoriti zaslon. Izlaženje."
+msgstr "wxWidgets nije uspio otvoriti zaslon. Prekid."
 
 #: ../src/richtext/richtextsymboldlg.cpp:434
 msgid "xxxx"
diff --git a/locale/ja.po b/locale/ja.po
index 6f27104693..fc97d12786 100644
--- a/locale/ja.po
+++ b/locale/ja.po
@@ -7,7 +7,7 @@ msgstr ""
 "PO-Revision-Date: 2011-03-02 18:30+0900\n"
 "Last-Translator: Suzumizaki-Kimitaka(鈴見咲�高) <suzumizaki@free."
 "japandesign.ne.jp>\n"
-"Language-Team: Japanese <wx-translators@wxwindows.org>\n"
+"Language-Team: Japanese <wx-translators@wxwidgets.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/lv.po b/locale/lv.po
index 66f21514f8..50dc79a1e3 100644
--- a/locale/lv.po
+++ b/locale/lv.po
@@ -5,7 +5,7 @@ msgstr ""
 "POT-Creation-Date: 2017-05-21 14:25+0200\n"
 "PO-Revision-Date: 2013-01-23 13:14+0300\n"
 "Last-Translator: J�nis Eisaks <jancs@dv.lv>\n"
-"Language-Team: wxWidgets translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWidgets translators <wx-translators@wxwidgets.org>\n"
 "Language: Latvian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release
index 00bd8eee95..9f9280c6d1 100755
--- a/misc/scripts/inc_release
+++ b/misc/scripts/inc_release
@@ -4,56 +4,11 @@
 # Purpose:    increments the release version number in all files mentioned in
 #             docs/contributing/about-version-numbers.md
 # Created:    2007-01-07
-# Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+# Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 # Licence:    wxWindows licence
 ##############################################################################
 
-error() {
-    echo "$progname: $*" >&2
-}
-
-msg() {
-    echo "$progname: $*"
-}
-
-msgn() {
-    echo -n "$progname: $*"
-}
-
-msgc() {
-    echo "$*"
-}
-
-run_sed() {
-    filename=$1
-    shift
-    cmd=
-    while [ $# -gt 0 ]; do
-        cmd="$cmd-e \"$1\" "
-        shift
-    done
-
-    msgn "	processing $filename ...	"
-    eval "sed $cmd $filename" > $filename.$$
-    if cmp -s $filename $filename.$$; then
-        rm $filename.$$
-        msgc "unchanged"
-    else
-        mv $filename.$$ $filename
-        msgc "done"
-    fi
-}
-
-progname=`basename $0`
-
-# we must be run from wx directory
-if [ ! -f wxwin.m4 ]; then
-    error "must be ran from root wx directory"
-    exit 1
-fi
-
-# exit on any error
-set -e
+. `dirname $0`/run_sed_common.sh
 
 # the primary source of information is wx/version.h
 ver_string=`grep '#define wxVERSION_STRING ' include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'`
diff --git a/misc/scripts/inc_year b/misc/scripts/inc_year
new file mode 100755
index 0000000000..28e2e53a2f
--- /dev/null
+++ b/misc/scripts/inc_year
@@ -0,0 +1,32 @@
+#!/bin/sh
+##############################################################################
+# Name:       misc/scripts/inc_year
+# Purpose:    increments the year in various copyright notices
+# Created:    2019-04-21
+# Copyright:  (c) 2019 Vadim Zeitlin <vadim@wxwidgets.org>
+# Licence:    wxWindows licence
+##############################################################################
+
+. `dirname $0`/run_sed_common.sh
+
+new_year=`date +%Y`
+old_year=`expr $new_year - 1`
+
+echo "Updating dates to use $new_year instead of $old_year:"
+
+# Update copyright to extend to the new year.
+for f in CMakeLists.txt \
+         docs/doxygen/mainpages/copyright.h docs/doxygen/regen.sh \
+         interface/wx/aboutdlg.h interface/wx/generic/aboutdlgg.h \
+         ; do
+    run_sed $f "s/1992-$old_year/1992-$new_year/"
+done
+
+# Some files use later initial copyright year, for some reason...
+run_sed src/msw/version.rc "s/1993-$old_year/1993-$new_year/"
+run_sed src/common/utilscmn.cpp "s/1995-$old_year/1995-$new_year/"
+
+# And Mac files are much newer than that.
+for f in samples/docview/Info.plist samples/minimal/Info_cocoa.plist; do
+    run_sed $f "s/2005-$old_year/2005-$new_year/"
+done
diff --git a/misc/scripts/makeunixtags.sh b/misc/scripts/makeunixtags.sh
index 730902b808..d03d331e3d 100755
--- a/misc/scripts/makeunixtags.sh
+++ b/misc/scripts/makeunixtags.sh
@@ -2,7 +2,7 @@
 # Name:       misc/scripts/makeunixtags.sh
 # Purpose:    create tags file for a wxWidgets port under a Unix system
 # Created:    2007-05-05
-# Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+# Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 # Licence:    wxWindows licence
 ##############################################################################
 
diff --git a/misc/scripts/run_sed_common.sh b/misc/scripts/run_sed_common.sh
new file mode 100644
index 0000000000..e3599732fe
--- /dev/null
+++ b/misc/scripts/run_sed_common.sh
@@ -0,0 +1,54 @@
+##############################################################################
+# Name:       misc/scripts/run_sed_common.sh
+# Purpose:    Common helpers for scripts using sed for automatic updates
+# Created:    2019-04-21 (extracted from misc/scripts/inc_release)
+# Copyright:  (c) 2007,2019 Vadim Zeitlin <vadim@wxwidgets.org>
+# Licence:    wxWindows licence
+##############################################################################
+
+error() {
+    echo "$progname: $*" >&2
+}
+
+msg() {
+    echo "$progname: $*"
+}
+
+msgn() {
+    echo -n "$progname: $*"
+}
+
+msgc() {
+    echo "$*"
+}
+
+run_sed() {
+    filename=$1
+    shift
+    cmd=
+    while [ $# -gt 0 ]; do
+        cmd="$cmd-e \"$1\" "
+        shift
+    done
+
+    msgn "	processing $filename ...	"
+    eval "sed $cmd $filename" > $filename.$$
+    if cmp -s $filename $filename.$$; then
+        rm $filename.$$
+        msgc "unchanged"
+    else
+        mv $filename.$$ $filename
+        msgc "done"
+    fi
+}
+
+progname=`basename $0`
+
+# we must be run from wx directory
+if [ ! -f wxwin.m4 ]; then
+    error "must be ran from root wx directory"
+    exit 1
+fi
+
+# exit on any error
+set -e
diff --git a/misc/scripts/set_install_name b/misc/scripts/set_install_name
index 87b1aa13a0..25dfd6ed46 100755
--- a/misc/scripts/set_install_name
+++ b/misc/scripts/set_install_name
@@ -3,7 +3,7 @@
 # Name:      set_install_name
 # Purpose:   set install_name for wx shared libraries under Mac OS X
 # Usage:     run with --help option to see the instructions
-# Copyright: (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+# Copyright: (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 # Licence:   wxWindows licence
 ################################################################################
 
diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index 38348d6331..348693cf14 100644
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -153,6 +153,7 @@ private:
     void OnAllowNotebookDnD(wxAuiNotebookEvent& evt);
     void OnNotebookPageClose(wxAuiNotebookEvent& evt);
     void OnNotebookPageClosed(wxAuiNotebookEvent& evt);
+    void OnNotebookPageChanging(wxAuiNotebookEvent &evt);
     void OnExit(wxCommandEvent& evt);
     void OnAbout(wxCommandEvent& evt);
     void OnTabAlignment(wxCommandEvent &evt);
@@ -654,6 +655,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD)
     EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose)
     EVT_AUINOTEBOOK_PAGE_CLOSED(wxID_ANY, MyFrame::OnNotebookPageClosed)
+    EVT_AUINOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebookPageChanging)
 wxEND_EVENT_TABLE()
 
 
@@ -1387,6 +1389,21 @@ void MyFrame::OnNotebookPageClosed(wxAuiNotebookEvent& evt)
     evt.Skip();
 }
 
+void MyFrame::OnNotebookPageChanging(wxAuiNotebookEvent& evt)
+{
+    if ( evt.GetOldSelection() == 3 )
+    {
+        if ( wxMessageBox( "Are you sure you want to leave this page?\n"
+                           "(This demonstrates veto-ing)",
+                           "wxAUI",
+                           wxICON_QUESTION | wxYES_NO,
+                           this ) != wxYES )
+        {
+            evt.Veto();
+        }
+    }
+}
+
 void MyFrame::OnAllowNotebookDnD(wxAuiNotebookEvent& evt)
 {
     // for the purpose of this test application, explicitly
diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp
index 27e2836e76..1b3e068183 100644
--- a/samples/clipboard/clipboard.cpp
+++ b/samples/clipboard/clipboard.cpp
@@ -50,6 +50,7 @@ public:
 
     void OnQuit(wxCommandEvent&event);
     void OnAbout(wxCommandEvent&event);
+    void OnFlush(wxCommandEvent &event);
     void OnWriteClipboardContents(wxCommandEvent&event);
     void OnUpdateUI(wxUpdateUIEvent&event);
 #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST
@@ -71,12 +72,14 @@ enum
     ID_Quit   = wxID_EXIT,
     ID_About  = wxID_ABOUT,
     ID_Write  = 100,
-    ID_Text   = 101
+    ID_Text   = 101,
+    ID_Flush  = 102
 };
 
 wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ID_Quit,  MyFrame::OnQuit)
     EVT_MENU(ID_About, MyFrame::OnAbout)
+    EVT_MENU(ID_Flush, MyFrame::OnFlush)
     EVT_BUTTON(ID_Write, MyFrame::OnWriteClipboardContents)
     EVT_UPDATE_UI(ID_Write, MyFrame::OnUpdateUI)
 #if USE_ASYNCHRONOUS_CLIPBOARD_REQUEST
@@ -116,6 +119,7 @@ MyFrame::MyFrame(const wxString& title)
     wxMenu *helpMenu = new wxMenu;
     helpMenu->Append(ID_About, "&About\tF1", "Show about dialog");
 
+    fileMenu->Append(ID_Flush, "Flush the clipboard" );
     fileMenu->Append(ID_Quit, "E&xit\tAlt-X", "Quit this program");
 
     // now append the freshly created menu to the menu bar...
@@ -137,6 +141,32 @@ MyFrame::MyFrame(const wxString& title)
     panel->SetSizer( main_sizer );
 }
 
+void MyFrame::OnFlush(wxCommandEvent &WXUNUSED(event))
+{
+    wxClipboardLocker clipLock;
+
+    if ( !clipLock )
+    {
+        m_textctrl->AppendText("Failed to lock clipboard.\n");
+        return;
+    }
+
+    if ( !wxTheClipboard->AddData(new wxTextDataObject("Text from wx clipboard sample")) )
+    {
+        m_textctrl->AppendText("Failed to put text on clipboard.\n");
+        return;
+    }
+
+    if ( !wxTheClipboard->Flush() )
+    {
+        m_textctrl->AppendText("Failed to flush clipboard.\n");
+        return;
+    }
+
+    m_textctrl->AppendText("Clipboard flushed successfully, you should now "
+                           "be able to paste text even after closing the sample.");
+}
+
 void MyFrame::OnWriteClipboardContents(wxCommandEvent& WXUNUSED(event))
 {
    if (wxTheClipboard->Open())
diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp
index 730504cab6..1a945bcc33 100644
--- a/samples/debugrpt/debugrpt.cpp
+++ b/samples/debugrpt/debugrpt.cpp
@@ -100,7 +100,7 @@ public:
         if ( !wxDebugReportCompress::DoProcess() )
             return false;
         wxMailMessage msg(GetReportName() + " crash report",
-                          "vadim@wxwindows.org",
+                          "vadim@wxwidgets.org",
                           wxEmptyString, // mail body
                           wxEmptyString, // from address
                           GetCompressedFileName(),
@@ -371,7 +371,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox
     (
-        "wxDebugReport sample\n(c) 2005 Vadim Zeitlin <vadim@wxwindows.org>",
+        "wxDebugReport sample\n(c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>",
         "wxWidgets Debug Report Sample",
         wxOK | wxICON_INFORMATION,
         this
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 578bb940ce..7ccab36a73 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -734,20 +734,35 @@ MyFrame::~MyFrame()
 
 #if wxUSE_COLOURDLG
 
+void MyFrame::DoApplyColour(const wxColour& colour)
+{
+    if ( colour == m_canvas->GetBackgroundColour() )
+        return;
+
+    m_canvas->SetBackgroundColour(colour);
+    m_canvas->ClearBackground();
+    m_canvas->Refresh();
+}
+
+void MyFrame::OnColourChanged(wxColourDialogEvent& event)
+{
+    DoApplyColour(event.GetColour());
+}
+
 void MyFrame::ChooseColour(wxCommandEvent& event)
 {
     m_clrData.SetColour(m_canvas->GetBackgroundColour());
     m_clrData.SetChooseAlpha(event.GetId() == DIALOGS_CHOOSE_COLOUR_ALPHA);
 
     wxColourDialog dialog(this, &m_clrData);
+    dialog.Bind(wxEVT_COLOUR_CHANGED, &MyFrame::OnColourChanged, this);
     dialog.SetTitle("Please choose the background colour");
     if ( dialog.ShowModal() == wxID_OK )
     {
         m_clrData = dialog.GetColourData();
-        m_canvas->SetBackgroundColour(m_clrData.GetColour());
-        m_canvas->ClearBackground();
-        m_canvas->Refresh();
     }
+
+    DoApplyColour(m_clrData.GetColour());
 }
 
 void MyFrame::GetColour(wxCommandEvent& WXUNUSED(event))
@@ -1493,7 +1508,13 @@ private:
         else
             msg = "Something else";
 
-        event.SetText(msg + " selected");
+        msg += " selected";
+
+        const int filter = dialog->GetCurrentlySelectedFilterIndex();
+        if ( filter != wxNOT_FOUND )
+            msg += wxString::Format(" (filter=%d)", filter);
+
+        event.SetText(msg);
     }
 
     wxString m_str;
@@ -1530,7 +1551,7 @@ MyExtraPanel::MyExtraPanel(wxWindow *parent)
     sizerTop->AddSpacer(5);
     sizerTop->Add(m_btn, wxSizerFlags().Centre().Border());
     sizerTop->AddSpacer(5);
-    sizerTop->Add(m_label, wxSizerFlags().Centre().Border());
+    sizerTop->Add(m_label, wxSizerFlags(1).Centre().Border());
 
     SetSizerAndFit(sizerTop);
 }
@@ -1549,11 +1570,12 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
                     "Testing open file dialog",
                     wxEmptyString,
                     wxEmptyString,
-#ifdef __WXMOTIF__
-                    "C++ files (*.cpp)|*.cpp"
-#else
-                    "C++ files (*.cpp;*.h)|*.cpp;*.h"
-#endif
+                    wxString::Format
+                    (
+                        "All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h",
+                        wxFileSelectorDefaultWildcardStr,
+                        wxFileSelectorDefaultWildcardStr
+                    )
                  );
 
     dialog.SetExtraControlCreator(&createMyExtraPanel);
@@ -3393,14 +3415,11 @@ SettingsDialog::SettingsDialog(wxWindow* win, SettingsData& settingsData, int di
         m_imageList = NULL;
 
     Create(win, wxID_ANY, "Preferences", wxDefaultPosition, wxDefaultSize,
-        wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder)
-    );
+           wxDEFAULT_DIALOG_STYLE | resizeBorder);
 
     // If using a toolbook, also follow Mac style and don't create buttons
     if (!useToolBook)
-        CreateButtons(wxOK | wxCANCEL |
-                        (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, wxHELP)
-    );
+        CreateButtons(wxOK | wxCANCEL | wxHELP);
 
     wxBookCtrlBase* notebook = GetBookCtrl();
     notebook->SetImageList(m_imageList);
@@ -3444,7 +3463,7 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent)
 
 #if wxUSE_SPINCTRL
     wxSpinCtrl* spinCtrl12 = new wxSpinCtrl(panel, ID_AUTO_SAVE_MINS, wxEmptyString,
-        wxDefaultPosition, wxSize(40, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 60, 1);
+        wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 60, 1);
     spinCtrl12->SetValidator(wxGenericValidator(&m_settingsData.m_autoSaveInterval));
 #endif
 
@@ -3515,8 +3534,7 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
     wxStaticBox* staticBox1 = new wxStaticBox(panel, wxID_ANY, "Tile font size:");
     wxBoxSizer* itemSizer5 = new wxStaticBoxSizer( staticBox1, wxHORIZONTAL );
 
-    wxSpinCtrl* spinCtrl = new wxSpinCtrl(panel, ID_FONT_SIZE, wxEmptyString, wxDefaultPosition,
-        wxSize(80, wxDefaultCoord));
+    wxSpinCtrl* spinCtrl = new wxSpinCtrl(panel, ID_FONT_SIZE, wxEmptyString);
     spinCtrl->SetValidator(wxGenericValidator(&m_settingsData.m_titleFontSize));
     itemSizer5->Add(spinCtrl, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 9d37f4b69b..89e96557e4 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -506,6 +506,11 @@ public:
     void OnExit(wxCommandEvent& event);
 
 private:
+#if wxUSE_COLOURDLG
+    void OnColourChanged(wxColourDialogEvent& event);
+    void DoApplyColour(const wxColour& colour);
+#endif // wxUSE_COLOURDLG
+
 #if wxUSE_DIRDLG
     void DoDirChoose(int style);
 #endif // wxUSE_DIRDLG
diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index ed5420d147..2d5b264dcb 100644
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -81,6 +81,9 @@ public:
     void OnLeftClick(wxMouseEvent& event);
 
 private:
+    // Fill m_book with the information about all the displays.
+    void PopuplateWithDisplayInfo();
+
 #if wxUSE_DISPLAY
     // convert video mode to textual description
     wxString VideoModeToText(const wxVideoMode& mode);
@@ -233,6 +236,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
     // create child controls
     m_book = new wxBookCtrl(this, wxID_ANY);
+    PopuplateWithDisplayInfo();
+}
+
+void MyFrame::PopuplateWithDisplayInfo()
+{
     const size_t countDpy = wxDisplay::GetCount();
     for ( size_t nDpy = 0; nDpy < countDpy; nDpy++ )
     {
@@ -426,16 +434,8 @@ void MyFrame::OnLeftClick(wxMouseEvent& event)
 
 void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 {
-    // update the current mode text
-    for ( size_t n = 0; n < m_book->GetPageCount(); n++ )
-    {
-        wxStaticText *label = wxDynamicCast(m_book->GetPage(n)->
-                                                FindWindow(Display_CurrentMode),
-                                            wxStaticText);
-        if ( label )
-            label->SetLabel(VideoModeToText(wxDisplay(n).GetCurrentMode()));
-    }
-
+    m_book->DeleteAllPages();
+    PopuplateWithDisplayInfo();
 
     wxLogStatus(this, "Display resolution was changed.");
 
diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index ef98445d90..b92dc717f6 100644
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.3, (c) 2005-2018 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.3, (c) 2005-2019 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>doc</string>
 	<key>CFBundleIdentifier</key>
@@ -66,7 +66,7 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.3, (c) 2005-2018 wxWidgets</string>
+	<string>3.1.3, (c) 2005-2019 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -82,6 +82,6 @@
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2018 wxWidgets</string>
+	<string>Copyright 2005-2019 wxWidgets</string>
 </dict>
 </plist>
diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 2b266b9231..44bc383d18 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -631,7 +631,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
     dc.SetPen( wxPen( *wxBLACK, width, wxPENSTYLE_DOT_DASH) );
     dc.DrawLine( x+20, y+60, 100, y+60 );
 
-    dc.DrawText("Misc hatches", x + 150, y + 70);
+    dc.DrawText("Hatches", x + 150, y + 70);
     dc.SetPen( wxPen( *wxBLACK, width, wxPENSTYLE_BDIAGONAL_HATCH) );
     dc.DrawLine( x+20, y+70, 100, y+70 );
     dc.SetPen( wxPen( *wxBLACK, width, wxPENSTYLE_CROSSDIAG_HATCH) );
@@ -669,6 +669,26 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
     ud.SetDashes( 6, dash1 );
     dc.SetPen( ud );
     dc.DrawLine( x+20, y+170, 100, y+170 );
+
+    wxPen penWithCap(*wxBLACK, width);
+    dc.SetPen(penWithCap);
+    dc.DrawText("Default cap", x+270, y+40);
+    dc.DrawLine( x+200, y+50, x+250, y+50);
+
+    penWithCap.SetCap(wxCAP_BUTT);
+    dc.SetPen(penWithCap);
+    dc.DrawText("Butt ", x+270, y+60);
+    dc.DrawLine( x+200, y+70, x+250, y+70);
+
+    penWithCap.SetCap(wxCAP_ROUND);
+    dc.SetPen(penWithCap);
+    dc.DrawText("Round cap", x+270, y+80);
+    dc.DrawLine( x+200, y+90, x+250, y+90);
+
+    penWithCap.SetCap(wxCAP_PROJECTING);
+    dc.SetPen(penWithCap);
+    dc.DrawText("Projecting cap", x+270, y+100);
+    dc.DrawLine( x+200, y+110, x+250, y+110);
 }
 
 void MyCanvas::DrawDefault(wxDC& dc)
@@ -1623,6 +1643,22 @@ void MyCanvas::DrawSystemColours(wxDC& dc)
     int lineHeight = textSize.GetHeight();
     wxRect r(textSize.GetWidth() + 10, 10, 100, lineHeight);
 
+    wxString title = "System colours";
+
+    const wxSystemAppearance appearance = wxSystemSettings::GetAppearance();
+    const wxString appearanceName = appearance.GetName();
+    if ( !appearanceName.empty() )
+        title += wxString::Format(" for \"%s\"", appearanceName);
+    if ( appearance.IsDark() )
+        title += " (using dark system theme)";
+    dc.DrawText(title, 10, r.y);
+    r.y += 2*lineHeight;
+    dc.DrawText(wxString::Format("Window background is %s",
+                                 appearance.IsUsingDarkBackground() ? "dark"
+                                                                    : "light"),
+                10, r.y);
+    r.y += 3*lineHeight;
+
     dc.SetPen(*wxTRANSPARENT_PEN);
 
     static const struct {
diff --git a/samples/internat/bg/internat.mo b/samples/internat/bg/internat.mo
index 3788520a51..62475b7ffb 100644
Binary files a/samples/internat/bg/internat.mo and b/samples/internat/bg/internat.mo differ
diff --git a/samples/internat/bg/internat.po b/samples/internat/bg/internat.po
index b4d4f2218e..ab79e50bcb 100644
--- a/samples/internat/bg/internat.po
+++ b/samples/internat/bg/internat.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2000-08-10 15:56+0200\n"
 "PO-Revision-Date: 2003-07-01 13:53+0200\n"
 "Last-Translator: Doncho Angelov <donangel AT poboxes DOT com>\n"
-"Language-Team:  <wx-translators@wxwindows.org>\n"
+"Language-Team:  <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/samples/internat/ru/internat.mo b/samples/internat/ru/internat.mo
index 67ec0726e3..3d69fe1542 100644
Binary files a/samples/internat/ru/internat.mo and b/samples/internat/ru/internat.mo differ
diff --git a/samples/internat/ru/internat.po b/samples/internat/ru/internat.po
index 461b3078b0..b98c8fe429 100644
--- a/samples/internat/ru/internat.po
+++ b/samples/internat/ru/internat.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2000-08-10 15:56+0200\n"
 "PO-Revision-Date: 2000-08-10 15:56+0200\n"
 "Last-Translator: Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>\n"
-"Language-Team: <wx-translators@wxwindows.org>\n"
+"Language-Team: <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index 556fa66516..4d17903c2d 100644
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -34,6 +34,11 @@ enum
     IDInputEntry,
     IDInputText,
 
+#if wxUSE_HOTKEY
+    HotKeyRegister,
+    HotKeyUnregister,
+#endif // wxUSE_HOTKEY
+
     TestAccelA,
     TestAccelCtrlA,
     TestAccelEsc
@@ -59,6 +64,33 @@ private:
     void OnTestAccelEsc(wxCommandEvent& WXUNUSED(event))
         { m_logText->AppendText("Test accelerator \"Esc\" used.\n"); }
 
+#if wxUSE_HOTKEY
+    void OnRegisterHotKey(wxCommandEvent& WXUNUSED(event))
+    {
+        if ( RegisterHotKey(0, wxMOD_ALT | wxMOD_SHIFT, WXK_HOME) )
+        {
+            m_logText->AppendText("Try pressing Alt-Shift-Home anywhere now.\n");
+        }
+        else
+        {
+            m_logText->AppendText("Failed to register hot key.\n");
+        }
+    }
+
+    void OnUnregisterHotKey(wxCommandEvent& WXUNUSED(event))
+    {
+        if ( !UnregisterHotKey(0) )
+        {
+            m_logText->AppendText("Failed to unregister hot key.\n");
+        }
+    }
+
+    void OnHotkey(wxKeyEvent& event)
+    {
+        LogEvent("Hot key", event);
+    }
+#endif // wxUSE_HOTKEY
+
     void OnClear(wxCommandEvent& WXUNUSED(event)) { m_logText->Clear(); }
     void OnSkipDown(wxCommandEvent& event) { m_skipDown = event.IsChecked(); }
     void OnSkipHook(wxCommandEvent& event) { m_skipHook = event.IsChecked(); }
@@ -186,6 +218,14 @@ MyFrame::MyFrame(const wxString& title)
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, "&File");
+
+#if wxUSE_HOTKEY
+    wxMenu* menuHotkey = new wxMenu;
+    menuHotkey->Append(HotKeyRegister, "&Register hot key");
+    menuHotkey->Append(HotKeyUnregister, "&Unregister hot key");
+    menuBar->Append(menuHotkey, "Hot&key");
+#endif // wxUSE_HOTKEY
+
     menuBar->Append(menuHelp, "&Help");
 
     // ... and attach this menu bar to the frame
@@ -232,6 +272,11 @@ MyFrame::MyFrame(const wxString& title)
     Bind(wxEVT_MENU, &MyFrame::OnTestAccelA, this, TestAccelA);
     Bind(wxEVT_MENU, &MyFrame::OnTestAccelCtrlA, this, TestAccelCtrlA);
     Bind(wxEVT_MENU, &MyFrame::OnTestAccelEsc, this, TestAccelEsc);
+#if wxUSE_HOTKEY
+    Bind(wxEVT_MENU, &MyFrame::OnRegisterHotKey, this, HotKeyRegister);
+    Bind(wxEVT_MENU, &MyFrame::OnUnregisterHotKey, this, HotKeyUnregister);
+    Bind(wxEVT_HOTKEY, &MyFrame::OnHotkey, this);
+#endif // wxUSE_HOTKEY
 
     // notice that we don't connect OnCharHook() to the input window, unlike
     // the usual key events this one is propagated upwards
diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index a8d38f6520..6ce7a10cb0 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -44,6 +44,7 @@
 #include "wx/sizer.h"
 #include "wx/sysopt.h"
 #include "wx/numdlg.h"
+#include "wx/selstore.h"
 
 #include "listtest.h"
 
@@ -1204,6 +1205,11 @@ void MyListCtrl::OnChecked(wxListEvent& event)
 {
     LogEvent(event, "OnChecked");
 
+    if ( IsVirtual() )
+    {
+        CheckItem(event.GetIndex(), true);
+    }
+
     event.Skip();
 }
 
@@ -1211,6 +1217,11 @@ void MyListCtrl::OnUnChecked(wxListEvent& event)
 {
     LogEvent(event, "OnUnChecked");
 
+    if ( IsVirtual() )
+    {
+        CheckItem(event.GetIndex(), false);
+    }
+
     event.Skip();
 }
 
@@ -1419,6 +1430,36 @@ wxString MyListCtrl::OnGetItemText(long item, long column) const
     }
 }
 
+void MyListCtrl::CheckItem(long item, bool check)
+{
+    if ( IsVirtual() )
+    {
+        m_checked.SelectItem(item, check);
+        RefreshItem(item);
+    }
+    else
+    {
+        wxListCtrl::CheckItem(item, check);
+    }
+}
+
+bool MyListCtrl::IsItemChecked(long item) const
+{
+    if ( IsVirtual() )
+    {
+        return m_checked.IsSelected(item);
+    }
+    else
+    {
+        return wxListCtrl::IsItemChecked(item);
+    }
+}
+
+bool MyListCtrl::OnGetItemIsChecked(long item) const
+{
+    return IsItemChecked(item);
+}
+
 int MyListCtrl::OnGetItemColumnImage(long item, long column) const
 {
     if (!column)
diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index e48b5292ef..dcdca2a55c 100644
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -74,6 +74,9 @@ public:
 
     void OnRightClick(wxMouseEvent& event);
 
+    virtual void CheckItem(long item, bool check) wxOVERRIDE;
+    virtual bool IsItemChecked(long item) const wxOVERRIDE;
+
 private:
     void ShowContextMenu(const wxPoint& pos);
     wxLog *m_logOld;
@@ -83,11 +86,14 @@ private:
     void LogColEvent(const wxListEvent& event, const wxString& eventName);
 
     virtual wxString OnGetItemText(long item, long column) const wxOVERRIDE;
+    virtual bool OnGetItemIsChecked(long item) const wxOVERRIDE;
     virtual int OnGetItemColumnImage(long item, long column) const wxOVERRIDE;
     virtual wxItemAttr *OnGetItemAttr(long item) const wxOVERRIDE;
 
     long m_updated;
 
+    // checked boxes in virtual list
+    wxSelectionStore m_checked;
 
     wxDECLARE_NO_COPY_CLASS(MyListCtrl);
     wxDECLARE_EVENT_TABLE();
diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist
index 8b2b276be9..3880a737fe 100644
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.3, (c) 2005-2018 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.3, (c) 2005-2019 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -22,7 +22,7 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.3, (c) 2005-2018 wxWidgets</string>
+	<string>3.1.3, (c) 2005-2019 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -34,7 +34,7 @@
 	<key>CFBundleVersion</key>
 	<string>3.1.3</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2018 wxWidgets</string>
+	<string>Copyright 2005-2019 wxWidgets</string>
 	<key>NSPrincipalClass</key>
 	<string>wxNSApplication</string>
 </dict>
diff --git a/samples/opengl/pyramid/mathstuff.cpp b/samples/opengl/pyramid/mathstuff.cpp
index 754a99663d..17721f8dbc 100644
--- a/samples/opengl/pyramid/mathstuff.cpp
+++ b/samples/opengl/pyramid/mathstuff.cpp
@@ -52,7 +52,7 @@ double MyDistance(const myVec3& v1, const myVec3& v2)
 }
 
 // Angle between two normalized vectors, in radians
-double AngleBetween(myVec3 v1, myVec3 v2)
+double AngleBetween(const myVec3& v1, const myVec3& v2)
 {
     double angle = MyDot(v1, v2);
     // Prevent issues due to numerical precision
diff --git a/samples/opengl/pyramid/mathstuff.h b/samples/opengl/pyramid/mathstuff.h
index 538ea13210..578d206c3f 100644
--- a/samples/opengl/pyramid/mathstuff.h
+++ b/samples/opengl/pyramid/mathstuff.h
@@ -56,7 +56,7 @@ myVec3 MyCross(const myVec3& v1, const myVec3& v2);
 double MyDistance(const myVec3& v1, const myVec3& v2);
 
 // Angle between two normalized vectors, in radians
-double AngleBetween(myVec3 v1, myVec3 v2);
+double AngleBetween(const myVec3& v1, const myVec3& v2);
 
 // Matrix 4x4 by 4x1 multiplication
 myVec4 MyMatMul4x1(const double *m1, const myVec4& v);
diff --git a/samples/opengl/pyramid/oglstuff.cpp b/samples/opengl/pyramid/oglstuff.cpp
index b2d2eafb5b..1f085a7ea8 100644
--- a/samples/opengl/pyramid/oglstuff.cpp
+++ b/samples/opengl/pyramid/oglstuff.cpp
@@ -305,14 +305,14 @@ void myOGLShaders::AddCode(const GLchar* shaString, GLenum shaType)
     m_shaCode.push_back(sv);
 }
 
-void myOGLShaders::AddAttrib(std::string name)
+void myOGLShaders::AddAttrib(const std::string& name)
 {
     shaVars sv = {0, name}; //We will set the location later
     m_shaAttrib.push_back(sv);
     // We don't check the max number of attribute locations (usually 16)
 }
 
-void myOGLShaders::AddUnif(std::string name)
+void myOGLShaders::AddUnif(const std::string& name)
 {
     shaVars sv = {0, name};
     m_shaUnif.push_back(sv);
@@ -333,7 +333,7 @@ void myOGLShaders::SetAttribLocations()
     }
 }
 
-GLuint myOGLShaders::GetAttribLoc(std::string name)
+GLuint myOGLShaders::GetAttribLoc(const std::string& name)
 {
     for (shaVars_v::iterator it = m_shaAttrib.begin(); it != m_shaAttrib.end(); ++it)
     {
@@ -362,7 +362,7 @@ bool myOGLShaders::AskUnifLocations()
     return true;
 }
 
-GLuint myOGLShaders::GetUnifLoc(std::string name)
+GLuint myOGLShaders::GetUnifLoc(const std::string& name)
 {
     for (shaVars_v::iterator it = m_shaUnif.begin(); it != m_shaUnif.end(); ++it)
     {
diff --git a/samples/opengl/pyramid/oglstuff.h b/samples/opengl/pyramid/oglstuff.h
index 010920c2ec..7163c6c750 100644
--- a/samples/opengl/pyramid/oglstuff.h
+++ b/samples/opengl/pyramid/oglstuff.h
@@ -109,10 +109,10 @@ public:
     void CleanUp();
 
     void AddCode(const GLchar* shaString, GLenum shaType);
-    void AddAttrib(std::string name);
-    void AddUnif(std::string name);
-    GLuint GetAttribLoc(std::string name);
-    GLuint GetUnifLoc(std::string name);
+    void AddAttrib(const std::string& name);
+    void AddUnif(const std::string& name);
+    GLuint GetAttribLoc(const std::string& name);
+    GLuint GetUnifLoc(const std::string& name);
     // Disable generic vertex attribute array
     void DisableGenericVAA();
 
diff --git a/samples/power/power.cpp b/samples/power/power.cpp
index 59fdfc96ba..b12afea3cd 100644
--- a/samples/power/power.cpp
+++ b/samples/power/power.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxWidgets power management sample
 // Author:      Vadim Zeitlin
 // Created:     2006-05-27
-// Copyright:   (C) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (C) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index db343f3a21..43cc8d3d1f 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -1063,9 +1063,9 @@ void FormMain::PopulateWithStandardItems ()
     // (for instance, wxPG_ATTR_MIN, instead of "min").
     // Using constant may reduce binary size.
 
-    pg->Append( new wxIntProperty("Height",wxPG_LABEL,480) );
-    pg->SetPropertyAttribute("Height", wxPG_ATTR_MIN, (long)10 );
-    pg->SetPropertyAttribute("Height", wxPG_ATTR_MAX, (long)2048 );
+    pg->Append( new wxIntProperty("Height",wxPG_LABEL,480L) );
+    pg->SetPropertyAttribute("Height", wxPG_ATTR_MIN, 10L );
+    pg->SetPropertyAttribute("Height", wxPG_ATTR_MAX, 2048L );
     pg->SetPropertyAttribute("Height", wxPG_ATTR_UNITS, "Pixels" );
 
     // Set value to unspecified so that Hint attribute will be demonstrated
@@ -1079,9 +1079,9 @@ void FormMain::PopulateWithStandardItems ()
     pg->SetPropertyHelpString("Height",
         "This property uses attributes \"Units\" and \"Hint\".");
 
-    pg->Append( new wxIntProperty("Width",wxPG_LABEL,640) );
-    pg->SetPropertyAttribute("Width", wxPG_ATTR_MIN, (long)10 );
-    pg->SetPropertyAttribute("Width", wxPG_ATTR_MAX, (long)2048 );
+    pg->Append( new wxIntProperty("Width",wxPG_LABEL,640L) );
+    pg->SetPropertyAttribute("Width", wxPG_ATTR_MIN, 10L );
+    pg->SetPropertyAttribute("Width", wxPG_ATTR_MAX, 2048L );
     pg->SetPropertyAttribute("Width", wxPG_ATTR_UNITS, "Pixels" );
 
     pg->SetPropertyValueUnspecified("Width");
@@ -1090,11 +1090,11 @@ void FormMain::PopulateWithStandardItems ()
     pg->SetPropertyHelpString("Width",
         "This property uses attributes \"Units\" and \"Hint\".");
 
-    pg->Append( new wxIntProperty("X",wxPG_LABEL,10) );
+    pg->Append( new wxIntProperty("X",wxPG_LABEL,10L) );
     pg->SetPropertyAttribute("X", wxPG_ATTR_UNITS, "Pixels" );
     pg->SetPropertyHelpString("X", "This property uses \"Units\" attribute.");
 
-    pg->Append( new wxIntProperty("Y",wxPG_LABEL,10) );
+    pg->Append( new wxIntProperty("Y",wxPG_LABEL,10L) );
     pg->SetPropertyAttribute("Y", wxPG_ATTR_UNITS, "Pixels" );
     pg->SetPropertyHelpString("Y", "This property uses \"Units\" attribute.");
 
@@ -1140,7 +1140,7 @@ void FormMain::PopulateWithStandardItems ()
     arrdbl.Add(1.0);
 
     pg->Append( new wxArrayDoubleProperty("ArrayDoubleProperty",wxPG_LABEL,arrdbl) );
-    //pg->SetPropertyAttribute("ArrayDoubleProperty",wxPG_FLOAT_PRECISION,(long)2);
+    //pg->SetPropertyAttribute("ArrayDoubleProperty",wxPG_FLOAT_PRECISION,2L);
     pg->SetPropertyHelpString( "ArrayDoubleProperty",
         "This demonstrates wxArrayDoubleProperty class defined in this sample app. "
         "It is an example of a custom list editor property."
@@ -1188,12 +1188,12 @@ void FormMain::PopulateWithExamples ()
     //pg->SetPropertyHelpString ( "Examples", "This category has example of (almost) every built-in property class." );
 
 #if wxUSE_SPINBTN
-    pg->Append( new wxIntProperty ( "SpinCtrl", wxPG_LABEL, 0 ) );
+    pg->Append( new wxIntProperty ( "SpinCtrl", wxPG_LABEL, 0L ) );
 
     pg->SetPropertyEditor( "SpinCtrl", wxPGEditor_SpinCtrl );
-    pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_MIN, (long)-10 );  // Use constants instead of string
-    pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_MAX, (long)16384 );   // for reduced binary size.
-    pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_SPINCTRL_STEP, (long)2 );
+    pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_MIN, -10L );  // Use constants instead of string
+    pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_MAX, 16384L );   // for reduced binary size.
+    pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_SPINCTRL_STEP, 2L );
     pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_SPINCTRL_MOTION, true );
     //pg->SetPropertyAttribute( "SpinCtrl", wxPG_ATTR_SPINCTRL_WRAP, true );
 
@@ -1429,7 +1429,7 @@ void FormMain::PopulateWithExamples ()
 
     pg->Append( new wxMultiChoiceProperty( "MultiChoiceProperty", wxPG_LABEL,
                                            tchoices, tchoicesValues ) );
-    pg->SetPropertyAttribute( "MultiChoiceProperty", wxPG_ATTR_MULTICHOICE_USERSTRINGMODE, true );
+    pg->SetPropertyAttribute("MultiChoiceProperty", wxPG_ATTR_MULTICHOICE_USERSTRINGMODE, 1);
 
     pg->Append( new wxSizeProperty( "SizeProperty", "Size", GetSize() ) );
     pg->Append( new wxPointProperty( "PointProperty", "Position", GetPosition() ) );
@@ -1518,7 +1518,7 @@ void FormMain::PopulateWithExamples ()
 
     pg->AppendIn(carProp, new wxIntProperty("Engine Size (cc)",
                                             wxPG_LABEL,
-                                            5707) );
+                                            5707L) );
 
     wxPGProperty* speedsProp = pg->AppendIn(carProp,
                                             new wxStringProperty("Speeds",
@@ -1526,7 +1526,7 @@ void FormMain::PopulateWithExamples ()
                                               "<composed>"));
 
     pg->AppendIn( speedsProp, new wxIntProperty("Max. Speed (mph)",
-                                                wxPG_LABEL,290) );
+                                                wxPG_LABEL,290L) );
     pg->AppendIn( speedsProp, new wxFloatProperty("0-100 mph (sec)",
                                                   wxPG_LABEL,3.9) );
     pg->AppendIn( speedsProp, new wxFloatProperty("1/4 mile (sec)",
@@ -1537,7 +1537,7 @@ void FormMain::PopulateWithExamples ()
 
     pg->AppendIn(carProp, new wxIntProperty("Price ($)",
                                             wxPG_LABEL,
-                                            300000) );
+                                            300000L) );
 
     pg->AppendIn(carProp, new wxBoolProperty("Convertible",
                                              wxPG_LABEL,
@@ -1581,7 +1581,7 @@ void FormMain::PopulateWithExamples ()
 
     pid->AppendChild( new wxStringProperty("Latest Release",
                                            wxPG_LABEL,
-                                           "3.0.2"));
+                                           "3.1.2"));
     pid->AppendChild( new wxBoolProperty("Win API",
                                          wxPG_LABEL,
                                          true) );
@@ -1590,10 +1590,9 @@ void FormMain::PopulateWithExamples ()
 
     pg->AppendIn(pid, new wxBoolProperty("QT", wxPG_LABEL, true) );
     pg->AppendIn(pid, new wxBoolProperty("Cocoa", wxPG_LABEL, true) );
-    pg->AppendIn(pid, new wxBoolProperty("BeOS", wxPG_LABEL, false) );
-    pg->AppendIn(pid, new wxStringProperty("Trunk Version", wxPG_LABEL, "3.1.0") );
+    pg->AppendIn(pid, new wxBoolProperty("Haiku", wxPG_LABEL, false) );
+    pg->AppendIn(pid, new wxStringProperty("Trunk Version", wxPG_LABEL, wxVERSION_NUM_DOT_STRING));
     pg->AppendIn(pid, new wxBoolProperty("GTK+", wxPG_LABEL, true) );
-    pg->AppendIn(pid, new wxBoolProperty("Sky OS", wxPG_LABEL, false) );
     pg->AppendIn(pid, new wxBoolProperty("Android", wxPG_LABEL, false) );
 
     AddTestProperties(pg);
@@ -1884,7 +1883,7 @@ void FormMain::PopulateGrid()
     PopulateWithLibraryConfig();
 
     wxPropertyGridPage* myPage = new wxMyPropertyGridPage();
-    myPage->Append( new wxIntProperty ( "IntProperty", wxPG_LABEL, 12345678 ) );
+    myPage->Append( new wxIntProperty ( "IntProperty", wxPG_LABEL, 12345678L ) );
 
     // Use wxMyPropertyGridPage (see above) to test the
     // custom wxPropertyGridPage feature.
@@ -1959,6 +1958,13 @@ void FormMain::CreateGrid( int style, int extraStyle )
 
     PopulateGrid();
 
+    m_propGrid->MakeColumnEditable(0, m_labelEditingEnabled);
+    m_pPropGridManager->ShowHeader(m_hasHeader);
+    if ( m_hasHeader )
+    {
+        m_pPropGridManager->SetColumnTitle(2, "Units");
+    }
+
     // Change some attributes in all properties
     //pgman->SetPropertyAttributeAll(wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING,true);
 
@@ -1981,6 +1987,8 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
 
     m_propGrid = NULL;
     m_panel = NULL;
+    m_hasHeader = false;
+    m_labelEditingEnabled = false;
 
 #ifdef __WXMAC__
     // we need this in order to allow the about menu relocation, since ABOUT is
@@ -2103,10 +2111,12 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
         "Select window style flags used by the grid.");
     menuTry->AppendCheckItem(ID_ENABLELABELEDITING, "Enable label editing",
         "This calls wxPropertyGrid::MakeColumnEditable(0)");
+    menuTry->Check(ID_ENABLELABELEDITING, m_labelEditingEnabled);
 #if wxUSE_HEADERCTRL
     menuTry->AppendCheckItem(ID_SHOWHEADER,
         "Enable header",
         "This calls wxPropertyGridManager::ShowHeader()");
+    menuTry->Check(ID_SHOWHEADER, m_hasHeader);
 #endif // wxUSE_HEADERCTRL
     menuTry->AppendSeparator();
     menuTry->AppendRadioItem( ID_COLOURSCHEME1, "Standard Colour Scheme" );
@@ -2693,7 +2703,8 @@ void FormMain::OnFreezeClick( wxCommandEvent& event )
 
 void FormMain::OnEnableLabelEditing(wxCommandEvent& event)
 {
-    m_propGrid->MakeColumnEditable(0, event.IsChecked());
+    m_labelEditingEnabled = event.IsChecked();
+    m_propGrid->MakeColumnEditable(0, m_labelEditingEnabled);
 }
 
 // -----------------------------------------------------------------------
@@ -2701,9 +2712,9 @@ void FormMain::OnEnableLabelEditing(wxCommandEvent& event)
 #if wxUSE_HEADERCTRL
 void FormMain::OnShowHeader( wxCommandEvent& event )
 {
-    bool show = event.IsChecked();
-    m_pPropGridManager->ShowHeader(show);
-    if ( show )
+    m_hasHeader = event.IsChecked();
+    m_pPropGridManager->ShowHeader(m_hasHeader);
+    if ( m_hasHeader )
     {
         m_pPropGridManager->SetColumnTitle(2, "Units");
     }
@@ -3064,7 +3075,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     {
         wxVariant list;
         list.NullList();
-        list.Append( wxVariant((long)1234,"VariantLong") );
+        list.Append( wxVariant(1234L,"VariantLong") );
         list.Append( wxVariant(true,"VariantBool") );
         list.Append( wxVariant("Test Text","VariantString") );
         m_pPropGridManager->GetGrid()->SetPropertyValues(list);
diff --git a/samples/propgrid/propgrid.h b/samples/propgrid/propgrid.h
index 7827ed3395..e20115b0b8 100644
--- a/samples/propgrid/propgrid.h
+++ b/samples/propgrid/propgrid.h
@@ -153,6 +153,8 @@ public:
     wxVariant       m_storedValues;
 
     wxString        m_savedState;
+    bool            m_hasHeader;
+    bool            m_labelEditingEnabled;
 
 
     void CreateGrid( int style, int extraStyle );
diff --git a/samples/propgrid/sampleprops.cpp b/samples/propgrid/sampleprops.cpp
index c32ec6e7c3..09060d0f95 100644
--- a/samples/propgrid/sampleprops.cpp
+++ b/samples/propgrid/sampleprops.cpp
@@ -621,7 +621,7 @@ bool wxArrayDoubleProperty::StringToValue( wxVariant& variant, const wxString& t
     // by returning pending value of non-wxArrayDouble type.
     if ( !ok )
     {
-        variant = (long)0;
+        variant = 0L;
         return true;
     }
 
@@ -642,7 +642,7 @@ bool wxArrayDoubleProperty::DoSetAttribute( const wxString& name, wxVariant& val
         GenerateValueAsString( m_display, m_precision, true );
         return true;
     }
-    return false;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 wxValidator* wxArrayDoubleProperty::DoGetValidator() const
diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp
index 1a9516b332..a4ccbbe9f5 100644
--- a/samples/propgrid/tests.cpp
+++ b/samples/propgrid/tests.cpp
@@ -120,29 +120,23 @@ void FormMain::AddTestProperties( wxPropertyGridPage* pg )
 void FormMain::OnDumpList( wxCommandEvent& WXUNUSED(event) )
 {
     wxVariant values = m_pPropGridManager->GetPropertyValues("list", wxNullProperty, wxPG_INC_ATTRIBUTES);
-    wxString text = "This only tests that wxVariant related routines do not crash.";
-    wxString t;
+    wxString text = "This only tests that wxVariant related routines do not crash.\n";
 
     wxDialog* dlg = new wxDialog(this,wxID_ANY,"wxVariant Test",
         wxDefaultPosition,wxDefaultSize,wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
 
-    unsigned int i;
-    for ( i = 0; i < (unsigned int)values.GetCount(); i++ )
+    for ( size_t i = 0; i < values.GetCount(); i++ )
     {
+        wxString t;
         wxVariant& v = values[i];
 
         wxString strValue = v.GetString();
 
-#if wxCHECK_VERSION(2,8,0)
         if ( v.GetName().EndsWith("@attr") )
-#else
-        if ( v.GetName().Right(5) == "@attr" )
-#endif
         {
             text += wxString::Format("Attributes:\n");
 
-            unsigned int n;
-            for ( n = 0; n < (unsigned int)v.GetCount(); n++ )
+            for ( size_t n = 0; n < v.GetCount(); n++ )
             {
                 wxVariant& a = v[n];
 
@@ -956,9 +950,9 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
         RT_START_TEST(Attributes)
 
         wxPGProperty* prop = pgman->GetProperty("StringProperty");
-        prop->SetAttribute("Dummy Attribute", (long)15);
+        prop->SetAttribute("Dummy Attribute", 15L);
 
-        if ( prop->GetAttribute("Dummy Attribute").GetLong() != 15 )
+        if ( prop->GetAttribute("Dummy Attribute").GetLong() != 15L )
             RT_FAILURE();
 
         prop->SetAttribute("Dummy Attribute", wxVariant());
@@ -967,6 +961,143 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
             RT_FAILURE();
     }
 
+    {
+        RT_START_TEST(Attributes with PGManager)
+
+        const long val = 25;
+        pgman->SetPropertyAttribute("IntProperty", "Dummy Attribute", val);
+        if ( pgman->GetPropertyAttribute("IntProperty", "Dummy Attribute").GetLong() != val )
+            RT_FAILURE();
+
+        pgman->SetPropertyAttribute("IntProperty", "Dummy Attribute", wxVariant());
+        if ( !pgman->GetPropertyAttribute("IntProperty", "Dummy Attribute").IsNull() )
+            RT_FAILURE();
+    }
+
+    {
+        RT_START_TEST(Getting list of attributes)
+
+        wxPGProperty* prop = pgman->GetProperty("Height");
+        const wxPGAttributeStorage& attrs1 = prop->GetAttributes();
+        if ( attrs1.GetCount() < 1 )
+            RT_FAILURE();
+
+        const wxPGAttributeStorage& attrs2 = pgman->GetPropertyAttributes("Height");
+        if ( attrs2.GetCount() != attrs1.GetCount() )
+            RT_FAILURE();
+
+        // Compare both lists
+        wxVariant val1;
+        wxVariant val2;
+        wxPGAttributeStorage::const_iterator it = attrs1.StartIteration();
+        while ( attrs1.GetNext(it, val1) )
+        {
+            val2 = attrs2.FindValue(val1.GetName());
+            if ( val1 != val2 )
+                RT_FAILURE();
+        }
+    }
+
+    {
+        RT_START_TEST(Copying list of attributes)
+
+        wxPGAttributeStorage attrs1(pgman->GetPropertyAttributes("Height"));
+        if ( attrs1.GetCount() < 1 )
+            RT_FAILURE();
+
+        wxPGAttributeStorage attrs2;
+        attrs2 = attrs1;
+        if ( attrs2.GetCount() != attrs1.GetCount() )
+            RT_FAILURE();
+
+        // Compare both lists
+        wxVariant val1;
+        wxVariant val2;
+        wxPGAttributeStorage::const_iterator it = attrs1.StartIteration();
+        while ( attrs1.GetNext(it, val1) )
+        {
+            val2 = attrs2.FindValue(val1.GetName());
+            if ( val1 != val2 )
+                RT_FAILURE();
+        }
+    }
+
+    {
+        RT_START_TEST(MaxLength)
+
+        wxPGProperty* prop1 = pgman->GetProperty("StringProperty");
+        if ( !prop1->SetMaxLength(10) )
+            RT_FAILURE();
+        if ( prop1->GetMaxLength() != 10 )
+            RT_FAILURE();
+
+        if ( !prop1->SetMaxLength(-1) )
+            RT_FAILURE();
+        if ( prop1->GetMaxLength() != 0 )
+            RT_FAILURE();
+
+        wxPGProperty* prop2 = pgman->GetProperty("LongStringProp");
+        if ( !prop2->SetMaxLength(20) )
+            RT_FAILURE();
+        if ( prop2->GetMaxLength() != 20 )
+            RT_FAILURE();
+
+        wxPGProperty* prop3 = pgman->GetProperty("IntProperty");
+        if ( !prop3->SetMaxLength(30) )
+            RT_FAILURE();
+        if ( prop3->GetMaxLength() != 30 )
+            RT_FAILURE();
+
+        wxPGProperty* prop4 = pgman->GetProperty("ArrayStringProperty");
+        if ( !prop4->SetMaxLength(40) )
+            RT_FAILURE();
+        if ( prop4->GetMaxLength() != 40 )
+            RT_FAILURE();
+
+        wxPGProperty* prop5 = pgman->GetProperty("EnumProperty");
+        if ( prop5->SetMaxLength(50) )
+            RT_FAILURE();
+
+        wxPGProperty* prop6 = pgman->GetProperty("BoolProperty");
+        if ( prop6->SetMaxLength(60) )
+            RT_FAILURE();
+    }
+
+    {
+        RT_START_TEST(MaxLength with PG)
+        pgman->SelectPage(2);
+        pg = pgman->GetGrid();
+
+        wxPGProperty* prop1 = pgman->GetProperty("StringProperty");
+        if ( !pg->SetPropertyMaxLength("StringProperty", 110) )
+            RT_FAILURE();
+        if ( prop1->GetMaxLength() != 110 )
+            RT_FAILURE();
+
+        if ( !pg->SetPropertyMaxLength("StringProperty", -1) )
+            RT_FAILURE();
+        if ( prop1->GetMaxLength() != 0 )
+            RT_FAILURE();
+
+        wxPGProperty* prop2 = pgman->GetProperty("LongStringProp");
+        if ( !pg->SetPropertyMaxLength("LongStringProp", 120) )
+            RT_FAILURE();
+        if ( prop2->GetMaxLength() != 120 )
+            RT_FAILURE();
+
+        wxPGProperty* prop3 = pgman->GetProperty("FloatProperty");
+        if ( !pg->SetPropertyMaxLength("FloatProperty", 130) )
+            RT_FAILURE();
+        if ( prop3->GetMaxLength() != 130 )
+            RT_FAILURE();
+
+        if ( pg->SetPropertyMaxLength("ColourProperty", 140) )
+            RT_FAILURE();
+
+        if ( pg->SetPropertyMaxLength("BoolProperty", 150) )
+            RT_FAILURE();
+    }
+
 #if WXWIN_COMPATIBILITY_3_0
     {
         RT_START_TEST(DoubleToString)
diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index 3dd3380ae4..cc6582e576 100644
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -929,10 +929,6 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
     wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE);
     sizer->Add(splitter, 1, wxEXPAND);
 
-    wxFont textFont = wxFont(wxFontInfo(12).Family(wxFONTFAMILY_ROMAN));
-    wxFont boldFont = wxFont(wxFontInfo(12).Family(wxFONTFAMILY_ROMAN));
-    wxFont italicFont = wxFont(wxFontInfo(12).Family(wxFONTFAMILY_ROMAN).Italic());
-
     m_richTextCtrl = new MyRichTextCtrl(splitter, ID_RICHTEXT_CTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxVSCROLL|wxHSCROLL/*|wxWANTS_CHARS*/);
     wxASSERT(!m_richTextCtrl->GetBuffer().GetAttributes().HasFontPixelSize());
 
@@ -1617,11 +1613,11 @@ void MyFrame::OnUpdateFormat(wxUpdateUIEvent& event)
 void MyFrame::OnUpdateImage(wxUpdateUIEvent& event)
 {
     wxRichTextRange range;
-    wxRichTextObject *obj;
 
     range = m_richTextCtrl->GetSelectionRange();
     if (range.ToInternal().GetLength() == 1)
     {
+        wxRichTextObject *obj;
         obj = m_richTextCtrl->GetFocusObject()->GetLeafObjectAtPosition(range.GetStart());
         if (obj && obj->IsKindOf(CLASSINFO(wxRichTextImage)))
         {
diff --git a/samples/sockets/baseclient.cpp b/samples/sockets/baseclient.cpp
index e389148772..50fe873796 100644
--- a/samples/sockets/baseclient.cpp
+++ b/samples/sockets/baseclient.cpp
@@ -27,7 +27,7 @@
 #include "wx/thread.h"
 
 const wxEventType wxEVT_WORKER = wxNewEventType();
-#define EVT_WORKER(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_WORKER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (WorkerEventFunction) & func, (wxObject *) NULL ),
+#define EVT_WORKER(func) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WORKER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (WorkerEventFunction) & func, (wxObject *) NULL ),
 
 const int timeout_val = 1000;
 
diff --git a/samples/sockets/baseserver.cpp b/samples/sockets/baseserver.cpp
index a2969d66ff..1884715ee1 100644
--- a/samples/sockets/baseserver.cpp
+++ b/samples/sockets/baseserver.cpp
@@ -64,7 +64,7 @@ const char *GetSocketErrorMsg(int pSockError)
 //event sent by workers to server class
 //after client is served
 const wxEventType wxEVT_WORKER = wxNewEventType();
-#define EVT_WORKER(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_WORKER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (WorkerEventFunction) & func, (wxObject *) NULL ),
+#define EVT_WORKER(func) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WORKER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (WorkerEventFunction) & func, (wxObject *) NULL ),
 
 class WorkerEvent : public wxEvent
 {
diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index f0bdb80161..f30be0e16c 100644
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -305,7 +305,7 @@ void MyFrame::OnWaitForAccept(wxCommandEvent& WXUNUSED(event))
 {
     TestLogger logtest("WaitForAccept() test");
 
-    wxBusyInfo("Waiting for connection for 10 seconds...", this);
+    wxBusyInfo info("Waiting for connection for 10 seconds...", this);
     if ( m_server->WaitForAccept(10) )
         wxLogMessage("Accepted client connection.");
     else
diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp
index e9aeac9990..0900639684 100644
--- a/samples/stc/edit.cpp
+++ b/samples/stc/edit.cpp
@@ -52,6 +52,22 @@
 // The (uniform) style used for the annotations.
 const int ANNOTATION_STYLE = wxSTC_STYLE_LASTPREDEFINED + 1;
 
+// A small image of a hashtag symbol used in the autocompletion window.
+const char* hashtag_xpm[] = {
+"10 10 2 1",
+" 	c None",
+".	c #BD08F9",
+"  ..  ..  ",
+"  ..  ..  ",
+"..........",
+"..........",
+"  ..  ..  ",
+"  ..  ..  ",
+"..........",
+"..........",
+"  ..  ..  ",
+"  ..  ..  "};
+
 //============================================================================
 // implementation
 //============================================================================
@@ -115,6 +131,7 @@ wxBEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl)
     // stc
     EVT_STC_MARGINCLICK (wxID_ANY,     Edit::OnMarginClick)
     EVT_STC_CHARADDED (wxID_ANY,       Edit::OnCharAdded)
+    EVT_STC_CALLTIP_CLICK(wxID_ANY,    Edit::OnCallTipClick)
 
     EVT_KEY_DOWN( Edit::OnKeyDown )
 wxEND_EVENT_TABLE()
@@ -169,6 +186,14 @@ Edit::Edit (wxWindow *parent, wxWindowID id,
     // annotations
     AnnotationSetVisible(wxSTC_ANNOTATION_BOXED);
 
+    // autocompletion
+    wxBitmap bmp(hashtag_xpm);
+    RegisterImage(0, bmp);
+
+    // call tips
+    CallTipSetBackground(*wxYELLOW);
+    m_calltipNo = 1;
+
     // miscellaneous
     m_LineNrMargin = TextWidth (wxSTC_STYLE_LINENUMBER, "_999999");
     m_FoldingMargin = 16;
@@ -211,11 +236,9 @@ void Edit::OnKeyDown (wxKeyEvent &event)
         CallTipCancel();
     if (event.GetKeyCode() == WXK_SPACE && event.ControlDown() && event.ShiftDown())
     {
-        int pos = GetCurrentPos();
-        CallTipSetBackground(*wxYELLOW);
-        CallTipShow(pos,
-                    "This is a CallTip with multiple lines.\n"
-                    "It is meant to be a context sensitive popup helper for the user.");
+        // Show our first call tip at the current position of the caret.
+        m_calltipNo = 1;
+        ShowCallTipAt(GetCurrentPos());
         return;
     }
     event.Skip();
@@ -481,11 +504,50 @@ void Edit::OnCharAdded (wxStyledTextEvent &event) {
         SetLineIndentation (currentLine, lineInd);
         GotoPos(PositionFromLine (currentLine) + lineInd);
     }
+    else if (chr == '#') {
+        wxString s = "define?0 elif?0 else?0 endif?0 error?0 if?0 ifdef?0 "
+                     "ifndef?0 include?0 line?0 pragma?0 undef?0";
+        AutoCompShow(0,s);
+    }
+}
+
+void Edit::OnCallTipClick(wxStyledTextEvent &event)
+{
+    if ( event.GetPosition() == 1 ) {
+        // If position=1, the up arrow has been clicked. Show the next tip.
+        m_calltipNo = m_calltipNo==3?1:(m_calltipNo+1);
+        ShowCallTipAt(CallTipPosAtStart());
+    }
+    else if ( event.GetPosition() == 2 ) {
+        // If position=2, the down arrow has been clicked. Show previous tip.
+        m_calltipNo = m_calltipNo==1?3:(m_calltipNo-1);
+        ShowCallTipAt(CallTipPosAtStart());
+    }
 }
 
 
 //----------------------------------------------------------------------------
 // private functions
+void Edit::ShowCallTipAt(int position)
+{
+    // In a call tip string, the character '\001' will become a clickable
+    // up arrow and '\002' will become a clickable down arrow.
+    wxString ctString = wxString::Format("\001 %d of 3 \002 ", m_calltipNo);
+    if ( m_calltipNo == 1 )
+        ctString += "This is a call tip. Try clicking the up or down buttons.";
+    else if ( m_calltipNo == 2 )
+        ctString += "It is meant to be a context sensitive popup helper for "
+                    "the user.";
+    else
+        ctString += "This is a call tip with multiple lines.\n"
+                    "You can provide slightly longer help with "
+                    "call tips like these.";
+
+    if ( CallTipActive() )
+        CallTipCancel();
+    CallTipShow(position, ctString);
+}
+
 wxString Edit::DeterminePrefs (const wxString &filename) {
 
     LanguageInfo const* curInfo;
diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 703ebae395..09ca020847 100644
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -105,9 +105,13 @@ public:
     // stc
     void OnMarginClick (wxStyledTextEvent &event);
     void OnCharAdded  (wxStyledTextEvent &event);
+    void OnCallTipClick(wxStyledTextEvent &event);
 
     void OnKeyDown(wxKeyEvent &event);
 
+    // call tips
+    void ShowCallTipAt(int position);
+
     //! language/lexer
     wxString DeterminePrefs (const wxString &filename);
     bool InitializePrefs (const wxString &filename);
@@ -137,6 +141,9 @@ private:
     int m_FoldingMargin;
     int m_DividerID;
 
+    // call tip data
+    int m_calltipNo;
+
     wxDECLARE_EVENT_TABLE();
 };
 
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index e3d6c9a276..bb77b0cbbc 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -780,7 +780,7 @@ public:
         StyleSetForeground(wxSTC_H_DOUBLESTRING, *wxBLACK);
         StyleSetForeground(wxSTC_H_SINGLESTRING, *wxBLACK);
         StyleSetForeground(wxSTC_H_OTHER, *wxBLUE);
-        StyleSetForeground(wxSTC_H_COMMENT, wxTheColourDatabase->Find("GREY"));
+        StyleSetForeground(wxSTC_H_COMMENT, wxColour("GREY"));
         StyleSetForeground(wxSTC_H_ENTITY, *wxRED);
         StyleSetBold(wxSTC_H_ENTITY, true);
         StyleSetForeground(wxSTC_H_TAGEND, *wxBLUE);
diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 63ba471f6d..6ade05c7d2 100644
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -350,7 +350,7 @@ void MyFrame::RecreateToolbar()
             style |= wxTB_RIGHT;
             break;
         case TOOLBAR_BOTTOM:
-        style |= wxTB_BOTTOM;
+            style |= wxTB_BOTTOM;
         break;
     }
 
@@ -443,7 +443,7 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
         wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(100,-1) );
         combo->Append("This");
         combo->Append("is a");
-        combo->Append("combobox");
+        combo->Append("combobox with extremely, extremely, extremely, extremely long label");
         combo->Append("in a");
         combo->Append("toolbar");
         toolBar->AddControl(combo, "Combo Label");
@@ -574,16 +574,16 @@ MyFrame::MyFrame(wxFrame* parent,
 
     tbarMenu->AppendSeparator();
     tbarMenu->AppendRadioItem(IDM_TOOLBAR_TOP_ORIENTATION,
-                              "Set toolbar at the top of the window",
+                              "Set toolbar at the top of the window\tCtrl-Up",
                               "Set toolbar at the top of the window");
     tbarMenu->AppendRadioItem(IDM_TOOLBAR_LEFT_ORIENTATION,
-                              "Set toolbar at the left of the window",
+                              "Set toolbar at the left of the window\tCtrl-Left",
                               "Set toolbar at the left of the window");
     tbarMenu->AppendRadioItem(IDM_TOOLBAR_BOTTOM_ORIENTATION,
-                              "Set toolbar at the bottom of the window",
+                              "Set toolbar at the bottom of the window\tCtrl-Down",
                               "Set toolbar at the bottom of the window");
     tbarMenu->AppendRadioItem(IDM_TOOLBAR_RIGHT_ORIENTATION,
-                              "Set toolbar at the right edge of the window",
+                              "Set toolbar at the right edge of the window\tCtrl-Right",
                               "Set toolbar at the right edge of the window");
     tbarMenu->AppendSeparator();
 
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index d365ed589f..63d3a87eed 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -1012,7 +1012,6 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) )
     textCtrl << "var1 = " << var1.MakeString() << "\n";
 
     // Conversion
-    wxString str = var1.MakeString();
 
     var1 = 123.456;
     textCtrl << "var1 = " << var1.GetReal() << "\n";
diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 55bf6a0169..40397aa270 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -650,7 +650,7 @@ bool TextValidatorDialog::StyleValidator::TransferToWindow()
         if ( !cb )
             return false;
 
-        const long style = 1 << (cb->GetId()-wxID_HIGHEST-1);
+        const long style = 1L << (cb->GetId()-wxID_HIGHEST-1);
 
         cb->SetValue((*m_style & style) != 0);
     }
@@ -668,7 +668,7 @@ bool TextValidatorDialog::StyleValidator::TransferFromWindow()
         if ( !cb )
             return false;
 
-        const long style = 1 << (cb->GetId()-wxID_HIGHEST-1);
+        const long style = 1L << (cb->GetId()-wxID_HIGHEST-1);
 
         if ( cb->IsChecked() )
             *m_style |= style;
diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index d684059885..bd9f911ebe 100644
--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@@ -343,13 +343,12 @@ public:
         wxSize clientSize = GetClientSize();
 
         wxCoord y = 0;
-        wxCoord x = 0;
         for ( size_t row = rowFirst; row < rowLast; row++ )
         {
             wxCoord rowHeight = OnGetRowHeight(row);
             dc.DrawLine(0, y, clientSize.GetWidth(), y);
 
-            x = 0;
+            wxCoord x = 0;
             for ( size_t col = columnFirst; col < columnLast; col++ )
             {
                 wxCoord colWidth = OnGetColumnWidth(col);
diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp
index 5f166ee61e..c9e1776568 100644
--- a/samples/widgets/clrpicker.cpp
+++ b/samples/widgets/clrpicker.cpp
@@ -83,6 +83,9 @@ protected:
 
 
     void OnColourChange(wxColourPickerEvent &ev);
+    void OnColourCurrentChanged(wxColourPickerEvent &ev);
+    void OnColourDialogCancelled(wxColourPickerEvent &ev);
+
     void OnCheckBox(wxCommandEvent &ev);
     void OnButtonReset(wxCommandEvent &ev);
 
@@ -111,6 +114,8 @@ wxBEGIN_EVENT_TABLE(ColourPickerWidgetsPage, WidgetsPage)
     EVT_BUTTON(PickerPage_Reset, ColourPickerWidgetsPage::OnButtonReset)
 
     EVT_COLOURPICKER_CHANGED(PickerPage_Colour, ColourPickerWidgetsPage::OnColourChange)
+    EVT_COLOURPICKER_CURRENT_CHANGED(PickerPage_Colour, ColourPickerWidgetsPage::OnColourCurrentChanged)
+    EVT_COLOURPICKER_DIALOG_CANCELLED(PickerPage_Colour, ColourPickerWidgetsPage::OnColourDialogCancelled)
 
     EVT_CHECKBOX(wxID_ANY, ColourPickerWidgetsPage::OnCheckBox)
 wxEND_EVENT_TABLE()
@@ -221,6 +226,18 @@ void ColourPickerWidgetsPage::OnColourChange(wxColourPickerEvent& event)
                  event.GetColour().GetAsString(wxC2S_CSS_SYNTAX));
 }
 
+void ColourPickerWidgetsPage::OnColourCurrentChanged(wxColourPickerEvent& event)
+{
+    wxLogMessage("The currently selected colour changed to '%s'",
+        event.GetColour().GetAsString(wxC2S_CSS_SYNTAX));
+}
+
+void ColourPickerWidgetsPage::OnColourDialogCancelled(wxColourPickerEvent& event)
+{
+    wxLogMessage("Colour selection dialog cancelled, current colour is '%s'",
+        event.GetColour().GetAsString(wxC2S_CSS_SYNTAX));
+}
+
 void ColourPickerWidgetsPage::OnCheckBox(wxCommandEvent &event)
 {
     if (event.GetEventObject() == m_chkColourTextCtrl ||
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 1e7a55062f..ad0ea7ec59 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -1571,12 +1571,13 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state)
     {
         if (tool->m_kind == wxITEM_RADIO)
         {
-            int i, idx, count;
+            int idx, count;
             idx = GetToolIndex(tool_id);
             count = (int)m_items.GetCount();
 
             if (idx >= 0 && idx < count)
             {
+                int i;
                 for (i = idx + 1; i < count; ++i)
                 {
                     if (m_items[i].m_kind != wxITEM_RADIO)
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index bf97bfa093..3eb9d4801c 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -1710,7 +1710,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
     positions.Empty();
     sizes.Empty();
 
-    int offset, action_pane = -1;
+    int action_pane = -1;
     int pane_i, pane_count = dock.panes.GetCount();
 
     // find the pane marked as our action pane
@@ -1773,7 +1773,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
 
     // if the dock mode is fixed, make sure none of the panes
     // overlap; we will bump panes that overlap
-    offset = 0;
+    int offset = 0;
     for (pane_i = action_pane; pane_i < pane_count; ++pane_i)
     {
         int amount = positions[pane_i] - offset;
@@ -1953,7 +1953,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont,
     }
     else
     {
-        sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
+        cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
     }
 }
 
diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp
index 4258a143fe..c75e29df5d 100644
--- a/src/aui/tabart.cpp
+++ b/src/aui/tabart.cpp
@@ -527,7 +527,7 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
     }
 
 
-    int text_offset = tab_x + 8;
+    int text_offset;
     int close_button_width = 0;
     if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
     {
diff --git a/src/aui/tabartgtk.cpp b/src/aui/tabartgtk.cpp
index 419ff06eea..c97caa7471 100644
--- a/src/aui/tabartgtk.cpp
+++ b/src/aui/tabartgtk.cpp
@@ -308,9 +308,9 @@ void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& p
 
     wxCoord textX = tab_rect.x + padding + style_notebook->xthickness;
 
-    int bitmap_offset = 0;
     if (page.bitmap.IsOk())
     {
+        int bitmap_offset;
         bitmap_offset = textX;
 
         // draw bitmap
diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index f15681541e..f391501751 100644
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of platform-independent wxAcceleratorEntry parts
 // Author:      Vadim Zeitlin
 // Created:     2007-05-05
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index d40861f7dd..186d845ad5 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003 (extracted from common/appcmn.cpp)
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index e78f8259b5..e3ebe2e43e 100644
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -370,13 +370,14 @@ int wxArrayString::Index(const wxString& str, bool bCase, bool bFromEnd) const
     wxASSERT_MSG( bCase && !bFromEnd,
                   wxT("search parameters ignored for auto sorted array") );
 
-    size_t i,
+    size_t
            lo = 0,
            hi = m_nCount;
-    int res;
     while ( lo < hi ) {
+      size_t i;
       i = (lo + hi)/2;
 
+      int res;
       res = str.compare(m_pItems[i]);
       if ( res < 0 )
         hi = i;
@@ -416,13 +417,14 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert)
 {
   if ( m_autoSort ) {
     // insert the string at the correct position to keep the array sorted
-    size_t i,
+    size_t
            lo = 0,
            hi = m_nCount;
-    int res;
     while ( lo < hi ) {
+      size_t i;
       i = (lo + hi)/2;
 
+      int res;
       res = m_compareFunction ? m_compareFunction(str, m_pItems[i]) : str.Cmp(m_pItems[i]);
       if ( res < 0 )
         hi = i;
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 64adcab544..5f9d100858 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/btncmn.cpp b/src/common/btncmn.cpp
index 912605ba5c..3e93f8d47f 100644
--- a/src/common/btncmn.cpp
+++ b/src/common/btncmn.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxButtonBase
 // Author:      Vadim Zeitlin
 // Created:     2007-04-08
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index f22482a2cd..ecaaf67641 100644
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -39,6 +39,9 @@ const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
 // ============================================================================
 
 wxDEFINE_EVENT(wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent);
+wxDEFINE_EVENT(wxEVT_COLOURPICKER_CURRENT_CHANGED, wxColourPickerEvent);
+wxDEFINE_EVENT(wxEVT_COLOURPICKER_DIALOG_CANCELLED, wxColourPickerEvent);
+
 wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase);
 wxIMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent);
 
@@ -129,10 +132,7 @@ void wxColourPickerCtrl::OnColourChange(wxColourPickerEvent &ev)
 {
     UpdateTextCtrlFromPicker();
 
-    // the wxColourPickerWidget sent us a colour-change notification.
-    // forward this event to our parent
-    wxColourPickerEvent event(this, GetId(), ev.GetColour());
-    GetEventHandler()->ProcessEvent(event);
+    ev.Skip();
 }
 
 #endif  // wxUSE_COLOURPICKERCTRL
diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 49b7c0c6b0..0ae45ceac8 100644
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -268,6 +268,11 @@ wxString wxColourBase::GetAsString(long flags) const
     return colName;
 }
 
+double wxColourBase::GetLuminance() const
+{
+    return (0.299*Red() + 0.587*Green() + 0.114*Blue()) / 255.0;
+}
+
 // static
 void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b,
                             bool on)
diff --git a/src/common/colourdata.cpp b/src/common/colourdata.cpp
index 2c2dddabf1..7d4efdb160 100644
--- a/src/common/colourdata.cpp
+++ b/src/common/colourdata.cpp
@@ -129,6 +129,10 @@ bool wxColourData::FromString(const wxString& str)
 
 #include "wx/colordlg.h"
 
+wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialogEvent, wxCommandEvent);
+
+wxDEFINE_EVENT(wxEVT_COLOUR_CHANGED, wxColourDialogEvent);
+
 wxColour wxGetColourFromUser(wxWindow *parent,
                              const wxColour& colInit,
                              const wxString& caption,
diff --git a/src/common/convauto.cpp b/src/common/convauto.cpp
index 6a5fba4ecb..952b4455f5 100644
--- a/src/common/convauto.cpp
+++ b/src/common/convauto.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxConvAuto
 // Author:      Vadim Zeitlin
 // Created:     2006-04-04
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -309,6 +309,13 @@ wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
     size_t rc = m_conv->ToWChar(dst, dstLen, src, srcLen);
     if ( rc == wxCONV_FAILED && m_bomType == wxBOM_None )
     {
+        // we may need more bytes before we can decode the input, don't switch
+        // to the fall-back conversion in this case as it would prevent us from
+        // decoding UTF-8 input when fed it byte by byte, as done by
+        // wxTextInputStream, for example
+        if ( srcLen < m_conv->GetMaxCharLen() )
+            return wxCONV_FAILED;
+
         // if the conversion failed but we didn't really detect anything and
         // simply tried UTF-8 by default, retry it using the fall-back
         if ( m_encDefault != wxFONTENCODING_MAX )
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 889cc26adc..28cf44bccf 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1067,7 +1067,7 @@ wxDataViewCustomRendererBase::RenderText(const wxString& text,
     int flags = 0;
     if ( state & wxDATAVIEW_CELL_SELECTED )
         flags |= wxCONTROL_SELECTED;
-    if ( !GetOwner()->GetOwner()->IsEnabled() )
+    if ( !(GetOwner()->GetOwner()->IsEnabled() && GetEnabled()) )
         flags |= wxCONTROL_DISABLED;
 
     // Notice that we intentionally don't use any alignment here: it is not
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 47000e5f1f..916afb07ec 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -792,13 +792,13 @@ static wxPointList wx_spline_point_list;
 void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
                  double b4)
 {
-    double xmid, ymid;
     double x1, y1, x2, y2, x3, y3, x4, y4;
 
     wx_clear_stack();
     wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
 
     while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
+        double xmid, ymid;
         xmid = (double)half(x2, x3);
         ymid = (double)half(y2, y3);
         if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
@@ -888,7 +888,7 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points )
     wxCHECK_RET( IsOk(), wxT("invalid window dc") );
 
     const wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
+    double cx1, cy1, cx2, cy2;
     double           x1, y1, x2, y2;
 
     wxPointList::compatibility_iterator node = points->GetFirst();
@@ -919,6 +919,7 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points )
 #endif // !wxUSE_STD_CONTAINERS
           )
     {
+        double cx3, cy3, cx4, cy4;
         p = node->GetData();
         x1 = x2;
         y1 = y2;
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 802ba8bf6a..796c3462ff 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -832,9 +832,6 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
         wxCoord cy4 = (y1 + y2) / 2;
 
         path.AddQuadCurveToPoint(x1 , y1 ,cx4 , cy4 );
-
-        cx1 = cx4;
-        cy1 = cy4;
     }
 
     path.AddLineToPoint( x2 , y2 );
diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index ff212b8829..494f3a615c 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -74,7 +74,7 @@ wxString Col2SVG(wxColour c, float *opacity)
 wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID)
 {
     float opacity;
-    wxString s = wxS("stroke:") + Col2SVG(c, &opacity)  + wxS("; ");
+    wxString s = wxS("stroke:") + Col2SVG(c, &opacity) + wxS("; ");
 
     switch ( style )
     {
@@ -89,7 +89,7 @@ wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID)
         case wxPENSTYLE_TRANSPARENT:
             s += wxS("stroke-opacity:0.0; ");
             break;
-        default :
+        default:
             wxASSERT_MSG(false, wxS("wxSVGFileDC::Requested Pen Style not available"));
     }
 
@@ -99,7 +99,7 @@ wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID)
 wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID)
 {
     float opacity;
-    wxString s = wxS("fill:") + Col2SVG(c, &opacity)  + wxS("; ");
+    wxString s = wxS("fill:") + Col2SVG(c, &opacity) + wxS("; ");
 
     switch ( style )
     {
@@ -114,7 +114,7 @@ wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID)
         case wxBRUSHSTYLE_TRANSPARENT:
             s += wxS("fill-opacity:0.0; ");
             break;
-        default :
+        default:
             wxASSERT_MSG(false, wxS("wxSVGFileDC::Requested Brush Style not available"));
     }
 
@@ -335,28 +335,28 @@ wxSVGBitmapFileHandler::ProcessBitmap(const wxBitmap& bmp,
         wxImage::AddHandler(new wxPNGHandler);
 
     // find a suitable file name
-    wxString sPNG;
+    wxFileName sPNG = m_path;
     do
     {
-        sPNG = wxString::Format("image%d.png", sub_images++);
+        sPNG.SetFullName(wxString::Format("%s%simage%d.png",
+                         sPNG.GetName(),
+                         sPNG.GetName().IsEmpty() ? "" : "_",
+                         sub_images++));
     }
-    while (wxFile::Exists(sPNG));
+    while ( sPNG.FileExists() );
 
-    if ( !bmp.SaveFile(sPNG, wxBITMAP_TYPE_PNG) )
+    if ( !bmp.SaveFile(sPNG.GetFullPath(), wxBITMAP_TYPE_PNG) )
         return false;
 
-    // reference the bitmap from the SVG doc using only filename & ext
-    sPNG = sPNG.AfterLast(wxFileName::GetPathSeparator());
-
     // reference the bitmap from the SVG doc
     wxString s;
     s += wxString::Format("  <image x=\"%d\" y=\"%d\" width=\"%dpx\" height=\"%dpx\"",
                           x, y, bmp.GetWidth(), bmp.GetHeight());
-    s += wxString::Format(" xlink:href=\"%s\"/>\n", sPNG);
+    s += wxString::Format(" xlink:href=\"%s\"/>\n", sPNG.GetFullName());
 
     // write to the SVG file
     const wxCharBuffer buf = s.utf8_str();
-    stream.Write(buf, strlen((const char *)buf));
+    stream.Write(buf, strlen((const char*)buf));
 
     return stream.IsOk();
 }
@@ -403,13 +403,12 @@ void wxSVGFileDCImpl::Init(const wxString &filename, int Width, int Height,
     m_textForegroundColour = *wxBLACK;
     m_textBackgroundColour = *wxWHITE;
 
-    m_pen   = *wxBLACK_PEN;
-    m_font  = *wxNORMAL_FONT;
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;
 
     m_filename = filename;
     m_graphics_changed = true;
-    m_sub_images = 0;
 
     ////////////////////code here
 
@@ -420,7 +419,7 @@ void wxSVGFileDCImpl::Init(const wxString &filename, int Width, int Height,
     s += wxS("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
     s += wxS("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.0//EN\" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n\n");
     s += wxS("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"");
-    s += wxString::Format(wxS(" width=\"%scm\" height=\"%scm\" viewBox=\"0 0 %d %d\">\n"), NumStr(float(Width) / dpi*2.54), NumStr(float(Height) / dpi*2.54), Width, Height);
+    s += wxString::Format(wxS(" width=\"%scm\" height=\"%scm\" viewBox=\"0 0 %d %d\">\n"), NumStr(float(Width) / dpi * 2.54), NumStr(float(Height) / dpi * 2.54), Width, Height);
     s += wxString::Format(wxS("<title>%s</title>\n"), title);
     s += wxString(wxS("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxS("</desc>\n\n");
     s += wxS("<g style=\"fill:black; stroke:black; stroke-width:1\">\n");
@@ -538,11 +537,11 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
 
     // wxS("upper left") and wxS("upper right")
     CalcBoundingBox(x, y);
-    CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
+    CalcBoundingBox((wxCoord)(x + w * cos(rad)), (wxCoord)(y - h * sin(rad)));
 
     // wxS("bottom left") and wxS("bottom right")
-    CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
-    CalcBoundingBox((wxCoord)(x + h*sin(rad) + w*cos(rad)), (wxCoord)(y + h*cos(rad) - w*sin(rad)));
+    CalcBoundingBox((wxCoord)(x + h * sin(rad)), (wxCoord)(y + h * cos(rad)));
+    CalcBoundingBox((wxCoord)(x + h * sin(rad) + w * cos(rad)), (wxCoord)(y + h * cos(rad) - w * sin(rad)));
 
     if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
     {
@@ -575,7 +574,7 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
         else
             s += wxS("style=\" ");
 
-        wxString fontweight = wxString::Format(wxS("%d"),m_font.GetWeight());
+        wxString fontweight = wxString::Format(wxS("%d"), m_font.GetWeight());
 
         s += wxS("font-weight:") + fontweight + wxS("; ");
 
@@ -618,11 +617,11 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor
         s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour);
         s += wxString::Format(wxS("stroke-width:0;\" transform=\"rotate(%s %d %d)\""), NumStr(-angle), xx, yy);
         s += wxS(" xml:space=\"preserve\">");
-        #if wxUSE_MARKUP
-            s += wxMarkupParser::Quote(lines[lineNum]) + wxS("</text>\n");
-        #else
-            s += lines[lineNum] + wxS("</text>\n");
-        #endif
+#if wxUSE_MARKUP
+        s += wxMarkupParser::Quote(lines[lineNum]) + wxS("</text>\n");
+#else
+        s += lines[lineNum] + wxS("</text>\n");
+#endif
 
         write(s);
     }
@@ -746,11 +745,11 @@ void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
     wxString s;
 
     // we need the radius of the circle which has two estimates
-    double r1 = sqrt ( double( (x1-xc)*(x1-xc) ) + double( (y1-yc)*(y1-yc) ) );
-    double r2 = sqrt ( double( (x2-xc)*(x2-xc) ) + double( (y2-yc)*(y2-yc) ) );
+    double r1 = sqrt( double( (x1 - xc)*(x1 - xc) ) + double( (y1 - yc)*(y1 - yc) ) );
+    double r2 = sqrt( double( (x2 - xc)*(x2 - xc) ) + double( (y2 - yc)*(y2 - yc) ) );
 
-    wxASSERT_MSG( (fabs ( r2-r1 ) <= 3), wxS("wxSVGFileDC::DoDrawArc Error in getting radii of circle"));
-    if ( fabs ( r2-r1 ) > 3 )    //pixels
+    wxASSERT_MSG((fabs( r2 - r1 ) <= 3), wxS("wxSVGFileDC::DoDrawArc Error in getting radii of circle"));
+    if ( fabs( r2 - r1 ) > 3 )    //pixels
     {
         s = wxS("<!--- wxSVGFileDC::DoDrawArc Error in getting radii of circle -->\n");
         write(s);
@@ -822,10 +821,10 @@ void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord
 
     // start and end coords
     double xs, ys, xe, ye;
-    xs = xc + rx * cos (wxDegToRad(sa));
-    xe = xc + rx * cos (wxDegToRad(ea));
-    ys = yc - ry * sin (wxDegToRad(sa));
-    ye = yc - ry * sin (wxDegToRad(ea));
+    xs = xc + rx * cos(wxDegToRad(sa));
+    xe = xc + rx * cos(wxDegToRad(ea));
+    ys = yc - ry * sin(wxDegToRad(sa));
+    ye = yc - ry * sin(wxDegToRad(ea));
 
     // svg arcs have 0 degrees at 12-o'clock instead of 3-o'clock
     double start = (sa - 90);
@@ -1004,8 +1003,6 @@ void wxSVGFileDCImpl::SetBrush(const wxBrush& brush)
 
 void wxSVGFileDCImpl::SetPen(const wxPen& pen)
 {
-    // width, color, ends, joins : currently implemented
-    // dashes, stipple :  not implemented
     m_pen = pen;
 
     m_graphics_changed = true;
@@ -1028,40 +1025,40 @@ void wxSVGFileDCImpl::DoStartNewGraphics()
     wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast;
 
     sBrush = wxS("<g style=\"") + wxBrushString(m_brush.GetColour(), m_brush.GetStyle())
-            + wxPenString(m_pen.GetColour(), m_pen.GetStyle());
+           + wxPenString(m_pen.GetColour(), m_pen.GetStyle());
 
     switch ( m_pen.GetCap() )
     {
-        case  wxCAP_PROJECTING :
+        case wxCAP_PROJECTING:
             sPenCap = wxS("stroke-linecap:square; ");
             break;
-        case  wxCAP_BUTT :
+        case wxCAP_BUTT:
             sPenCap = wxS("stroke-linecap:butt; ");
             break;
-        case    wxCAP_ROUND :
-        default :
+        case wxCAP_ROUND:
+        default:
             sPenCap = wxS("stroke-linecap:round; ");
     }
 
-    switch ( m_pen.GetJoin() )
+    switch (m_pen.GetJoin())
     {
-        case  wxJOIN_BEVEL :
+        case wxJOIN_BEVEL:
             sPenJoin = wxS("stroke-linejoin:bevel; ");
             break;
-        case  wxJOIN_MITER :
+        case wxJOIN_MITER:
             sPenJoin = wxS("stroke-linejoin:miter; ");
             break;
-        case    wxJOIN_ROUND :
-        default :
+        case wxJOIN_ROUND:
+        default:
             sPenJoin = wxS("stroke-linejoin:round; ");
     }
 
     sLast = wxString::Format(wxS("stroke-width:%d\" transform=\"translate(%s %s) scale(%s %s)\">"),
-                 m_pen.GetWidth(),
-                 NumStr((m_deviceOriginX - m_logicalOriginX)* m_signX),
-                 NumStr((m_deviceOriginY - m_logicalOriginY)* m_signY),
-                 NumStr(m_scaleX * m_signX),
-                 NumStr(m_scaleY * m_signY));
+                             m_pen.GetWidth(),
+                             NumStr((m_deviceOriginX - m_logicalOriginX)* m_signX),
+                             NumStr((m_deviceOriginY - m_logicalOriginY)* m_signY),
+                             NumStr(m_scaleX * m_signX),
+                             NumStr(m_scaleY * m_signY));
 
     s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxS("\n");
     write(s);
@@ -1074,9 +1071,9 @@ void wxSVGFileDCImpl::SetFont(const wxFont& font)
 
 // export a bitmap as a raster image in png
 bool wxSVGFileDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                        wxDC* source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode logicalFunc /*= wxCOPY*/, bool useMask /*= false*/,
-                        wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
+                             wxDC* source, wxCoord xsrc, wxCoord ysrc,
+                             wxRasterOperationMode logicalFunc /*= wxCOPY*/, bool useMask /*= false*/,
+                             wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
 {
     if (logicalFunc != wxCOPY)
     {
@@ -1107,13 +1104,13 @@ void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord
     DoDrawBitmap(myBitmap, x, y);
 }
 
-void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y, bool  WXUNUSED(bTransparent) /*=0*/)
+void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y, bool WXUNUSED(bTransparent) /*=0*/)
 {
     NewGraphicsIfNeeded();
 
     // If we don't have any bitmap handler yet, use the default one.
     if ( !m_bmp_handler )
-        m_bmp_handler.reset(new wxSVGBitmapFileHandler());
+        m_bmp_handler.reset(new wxSVGBitmapFileHandler(m_filename));
 
     m_bmp_handler->ProcessBitmap(bmp, x, y, *m_outfile);
 }
diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 9f8ffb9936..8e25ed4334 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -911,7 +911,6 @@ bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxWindo
 
     wxSize windowSize, displaySize;
     int scrollFlags = DoMustScroll(dialog, windowSize, displaySize);
-    int scrollBarSize = 20;
 
     if (scrollFlags)
     {
@@ -922,6 +921,7 @@ bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxWindo
         if (windows.GetCount() != 0)
         {
             // Allow extra for a scrollbar, assuming we resizing in one direction only.
+            int scrollBarSize = 20;
             if ((resizeVertically && !resizeHorizontally) && (windowSize.x < (displaySize.x - scrollBarSize)))
                 scrollBarExtraX = scrollBarSize;
             if ((resizeHorizontally && !resizeVertically) && (windowSize.y < (displaySize.y - scrollBarSize)))
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 8f958f4777..241fa2cf42 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -2235,11 +2235,10 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
     if ( !file.IsOpened() )
         return false;
 
-    char buf[4096];
-
-    size_t nRead;
     do
     {
+        char buf[4096];
+        size_t nRead;
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
             return false;
diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index 85262ae042..a73a8f423a 100644
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.03.03
-// Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index b9094288ed..f9f41ef9c2 100644
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -157,12 +157,12 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
         else // output !Unicode
         {
             CharsetItem *rev = BuildReverseTable(out_tbl);
-            CharsetItem *item;
             CharsetItem key;
 
             for (i = 0; i < 128; i++)
             {
                 key.u = in_tbl[i];
+                CharsetItem* item;
                 item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems);
                 if (item == NULL && method == wxCONVERT_SUBSTITUTE)
                     item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 94a6f93d61..bc713b84e1 100644
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -3,7 +3,7 @@
 // Purpose:     common wxEventLoop-related stuff
 // Author:      Vadim Zeitlin
 // Created:     2006-01-12
-// Copyright:   (c) 2006, 2013 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006, 2013 Vadim Zeitlin <vadim@wxwidgets.org>
 //              (c) 2013 Rob Bresalier
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp
index 760899e234..c14b9082f3 100644
--- a/src/common/fdiodispatcher.cpp
+++ b/src/common/fdiodispatcher.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implementation of common wxFDIODispatcher methods
 // Author:      Vadim Zeitlin
 // Created:     2007-05-13
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index ede1e9a157..abccca0abb 100644
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -263,11 +263,11 @@ wxFileOffset wxFFile::Length() const
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
                  wxT("wxFFile::Length(): file is closed!") );
 
-    wxFFile& self = *const_cast<wxFFile *>(this);
-
     wxFileOffset posOld = Tell();
     if ( posOld != wxInvalidOffset )
     {
+        wxFFile& self = *const_cast<wxFFile*>(this);
+
         if ( self.SeekEnd() )
         {
             wxFileOffset len = Tell();
diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 77fa9a8103..54262d8038 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -1535,16 +1535,17 @@ wxString wxFileConfigGroup::GetFullName() const
 wxFileConfigEntry *
 wxFileConfigGroup::FindEntry(const wxString& name) const
 {
-  size_t i,
+  size_t
        lo = 0,
        hi = m_aEntries.GetCount();
-  int res;
   wxFileConfigEntry *pEntry;
 
   while ( lo < hi ) {
+    size_t i;
     i = (lo + hi)/2;
     pEntry = m_aEntries[i];
 
+    int res;
     #if wxCONFIG_CASE_SENSITIVE
       res = pEntry->Name().compare(name);
     #else
@@ -1565,16 +1566,17 @@ wxFileConfigGroup::FindEntry(const wxString& name) const
 wxFileConfigGroup *
 wxFileConfigGroup::FindSubgroup(const wxString& name) const
 {
-  size_t i,
+  size_t
        lo = 0,
        hi = m_aSubgroups.GetCount();
-  int res;
   wxFileConfigGroup *pGroup;
 
   while ( lo < hi ) {
+    size_t i;
     i = (lo + hi)/2;
     pGroup = m_aSubgroups[i];
 
+    int res;
     #if wxCONFIG_CASE_SENSITIVE
       res = pGroup->Name().compare(name);
     #else
diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 232f41aa40..8406b93898 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -58,12 +58,12 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
     wxString ext, mime;
     wxString loc = GetRightLocation(location);
-    wxChar c;
     int l = loc.length(), l2;
 
     l2 = l;
     for (int i = l-1; i >= 0; i--)
     {
+        wxChar c;
         c = loc[(unsigned int) i];
         if ( c == wxT('#') )
             l2 = i + 1;
@@ -234,10 +234,10 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location)
 /* static */
 wxString wxFileSystemHandler::GetAnchor(const wxString& location)
 {
-    wxChar c;
     int l = location.length();
 
     for (int i = l-1; i >= 0; i--) {
+        wxChar c;
         c = location[i];
         if (c == wxT('#'))
             return location.Right(l-i-1);
@@ -384,7 +384,6 @@ static wxString MakeCorrectPath(const wxString& path)
 
 void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
 {
-    int i, pathpos = -1;
 
     m_Path = MakeCorrectPath(location);
 
@@ -393,9 +392,9 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
         if (!m_Path.empty() && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
             m_Path << wxT('/');
     }
-
     else
     {
+        int i, pathpos = -1;
         for (i = m_Path.length()-1; i >= 0; i--)
         {
             if (m_Path[(unsigned int) i] == wxT('/'))
diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index 69f28d5320..2084c050ab 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -46,6 +46,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog);
 void wxFileDialogBase::Init()
 {
     m_filterIndex = 0;
+    m_currentlySelectedFilterIndex = wxNOT_FOUND;
     m_windowStyle = 0;
     m_extraControl = NULL;
     m_extraControlCreator = NULL;
diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index 9bef0110dc..0c434aef67 100644
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp
index 183e241287..eac3a7e003 100644
--- a/src/common/fontenumcmn.cpp
+++ b/src/common/fontenumcmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     7/5/2006
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index ffac05c213..18e26c763e 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.11.99
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 281cdbbc88..dd74323c36 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -147,22 +147,16 @@ wxString wxMemoryFSHandlerBase::FindFirst(const wxString& url, int flags)
 
 wxString wxMemoryFSHandlerBase::FindNext()
 {
-    // m_findArgument is used to indicate that search is in progress, we reset
-    // it to empty string after iterating over all elements
-    while ( !m_findArgument.empty() )
+    while ( m_findIter != m_Hash.end() )
     {
-        // test for the match before (possibly) clearing m_findArgument below
-        const bool found = m_findIter->first.Matches(m_findArgument);
+        const wxString& path = m_findIter->first;
 
         // advance m_findIter first as we need to do it anyhow, whether it
         // matches or not
-        const wxMemoryFSHash::const_iterator current = m_findIter;
+        ++m_findIter;
 
-        if ( ++m_findIter == m_Hash.end() )
-            m_findArgument.clear();
-
-        if ( found )
-            return "memory:" + current->first;
+        if ( path.Matches(m_findArgument) )
+            return "memory:" + path;
     }
 
     return wxString();
diff --git a/src/common/gbsizer.cpp b/src/common/gbsizer.cpp
index 7ee9b8273a..1f4e7d25cf 100644
--- a/src/common/gbsizer.cpp
+++ b/src/common/gbsizer.cpp
@@ -546,11 +546,11 @@ void wxGridBagSizer::RepositionChildren(const wxSize& minSize)
     wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
-        int row, col, endrow, endcol;
         wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
 
         if ( item->IsShown() )
         {
+            int row, col, endrow, endcol;
             item->GetPos(row, col);
             item->GetEndPos(endrow, endcol);
 
diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index af945d6589..74d5b1cfa1 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -376,7 +376,7 @@ wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits)
     int pos;                        // index into decompresion stack
     unsigned int x, y;              // position in image buffer
 
-    int code, readcode, lastcode, abcabca;
+    int code, lastcode, abcabca;
 
     // these won't change
     ab_clr = (1 << bits);
@@ -399,6 +399,7 @@ wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits)
     do
     {
         // get next code
+        int readcode;
         readcode = code = getcode(stream, ab_bits, ab_fin);
 
         // end of image?
@@ -887,7 +888,7 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
         }
     }
 
-    if (m_nFrames <= 0)
+    if (m_nFrames == 0)
     {
         Destroy();
         return wxGIF_INVFORMAT;
diff --git a/src/common/glcmn.cpp b/src/common/glcmn.cpp
index 5512f93407..e0c056aa9a 100644
--- a/src/common/glcmn.cpp
+++ b/src/common/glcmn.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxGLCanvasBase implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-04-09
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 41e9e86dee..ce8a133658 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1004,7 +1004,6 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
 {
     wxUint16        aWord;
     wxInt32         dbuf[4];
-    wxInt8          bbuf[4];
 
     // offset to bitmap data
     wxFileOffset offset;
@@ -1012,6 +1011,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     wxInt32 hdrSize;
     if ( IsBmp )
     {
+        wxInt8 bbuf[4];
         // read the header off the .BMP format file
         if ( !stream.ReadAll(bbuf, 2) ||
              !stream.ReadAll(dbuf, 16) )
diff --git a/src/common/image.cpp b/src/common/image.cpp
index c3e79a571d..a6575bb25c 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1339,7 +1339,6 @@ wxImage wxImage::Rotate90( bool clockwise ) const
     if ( source_alpha )
     {
         unsigned char *alpha_data = image.GetAlpha();
-        unsigned char *target_alpha = 0 ;
 
         for (long ii = 0; ii < width; )
         {
@@ -1351,6 +1350,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const
 
                 for (long i = ii; i < next_ii; i++)
                 {
+                    unsigned char* target_alpha;
                     if ( clockwise )
                     {
                         target_alpha = alpha_data + (i+1)*height - j - 1;
@@ -1929,10 +1929,10 @@ void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, uns
         x2 = rect.GetRight() + 1,
         y2 = rect.GetBottom() + 1;
 
-    unsigned char *data wxDUMMY_INITIALIZE(NULL);
     int x, y, width = GetWidth();
     for (y = y1; y < y2; y++)
     {
+        unsigned char* data;
         data = M_IMGDATA->m_data + (y*width + x1)*3;
         for (x = x1; x < x2; x++)
         {
@@ -3236,8 +3236,6 @@ void wxImage::RotateHue(double angle)
 {
     AllocExclusive();
 
-    unsigned char *srcBytePtr;
-    unsigned char *dstBytePtr;
     unsigned long count;
     wxImage::HSVValue hsv;
     wxImage::RGBValue rgb;
@@ -3246,6 +3244,8 @@ void wxImage::RotateHue(double angle)
     count = M_IMGDATA->m_width * M_IMGDATA->m_height;
     if ( count > 0 && !wxIsNullDouble(angle) )
     {
+        unsigned char* srcBytePtr;
+        unsigned char* dstBytePtr;
         srcBytePtr = M_IMGDATA->m_data;
         dstBytePtr = srcBytePtr;
         do
@@ -3448,16 +3448,17 @@ unsigned long wxImage::CountColours( unsigned long stopafter ) const
 {
     wxHashTable h;
     wxObject dummy;
-    unsigned char r, g, b;
     unsigned char *p;
-    unsigned long size, nentries, key;
+    unsigned long size, nentries;
 
     p = GetData();
-    size = GetWidth() * GetHeight();
+    size = static_cast<unsigned long>(GetWidth()) * GetHeight();
     nentries = 0;
 
     for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
     {
+        unsigned char r, g, b;
+        unsigned long key;
         r = *(p++);
         g = *(p++);
         b = *(p++);
@@ -3481,11 +3482,11 @@ unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
 
     h.clear();
 
-    const unsigned long size = GetWidth() * GetHeight();
+    const unsigned long size = static_cast<unsigned long>(GetWidth()) * GetHeight();
 
-    unsigned char r, g, b;
     for ( unsigned long n = 0; n < size; n++ )
     {
+        unsigned char r, g, b;
         r = *p++;
         g = *p++;
         b = *p++;
diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index c75775fb15..a14cb2f26a 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -394,9 +394,7 @@ bool wxGIFHandler::SetupCompress(wxOutputStream *stream, int bpp)
 bool wxGIFHandler::CompressLine(wxOutputStream *stream,
     const wxUint8 *line, int lineLen)
 {
-    int i = 0, crntCode, newCode;
-    unsigned long newKey;
-    wxUint8 pixel;
+    int i = 0, crntCode;
     if (m_crntCode == FIRST_CODE)                  // It's first time!
         crntCode = line[i++];
     else
@@ -405,10 +403,13 @@ bool wxGIFHandler::CompressLine(wxOutputStream *stream,
     while (i < lineLen)
     {
         // Decode lineLen items.
+        wxUint8 pixel;
         pixel = line[i++];                    // Get next pixel from stream.
         // Form a new unique key to search hash table for the code combines
         // crntCode as Prefix string with Pixel as postfix char.
+        unsigned long newKey;
         newKey = (((unsigned long) crntCode) << 8) + pixel;
+        int newCode;
         if ((newCode = ExistsHashTable(newKey)) >= 0)
         {
             // This Key is already there, or the string is old one, so
diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 41a3f2d8bb..ea293f0b06 100644
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -44,7 +44,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler);
 static
 void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
 {
-    unsigned int data, last, cont;
+    unsigned int last, cont;
 
     // Write 'size' bytes. The PCX official specs say there will be
     // a decoding break at the end of each scanline, so in order to
@@ -57,6 +57,7 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
 
     while (size-- > 0)
     {
+        unsigned data;
         data = (unsigned char) *(p++);
 
         // Up to 63 bytes with the same value can be stored using
@@ -266,8 +267,6 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 
     if (format == wxPCX_8BIT)
     {
-        unsigned char index;
-
         if (stream.GetC() != 12)
             return wxPCX_INVFORMAT;
 
@@ -276,6 +275,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
         p = image->GetData();
         for (unsigned long k = height * width; k; k--)
         {
+            unsigned char index;
             index = *p;
             *(p++) = pal[3 * index];
             *(p++) = pal[3 * index + 1];
@@ -310,7 +310,6 @@ static
 int SavePCX(wxImage *image, wxOutputStream& stream)
 {
     unsigned char hdr[128];         // PCX header
-    unsigned char pal[768];         // palette for 8 bit images
     unsigned char *p;               // space to store one scanline
     unsigned char *src;             // pointer into wxImage data
     unsigned int width, height;     // size of the image
@@ -376,10 +375,9 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
         {
             case wxPCX_8BIT:
             {
-                unsigned char r, g, b;
-
                 for (i = 0; i < width; i++)
                 {
+                    unsigned char r, g, b;
                     r = *(src++);
                     g = *(src++);
                     b = *(src++);
@@ -409,15 +407,15 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
     // For 8 bit images, build the palette and write it to the stream:
     if (format == wxPCX_8BIT)
     {
+        unsigned char pal[768];
         // zero unused colours
         memset(pal, 0, sizeof(pal));
 
-        unsigned long index;
-
         for (wxImageHistogram::iterator entry = histogram.begin();
              entry != histogram.end(); ++entry )
         {
             key = entry->first;
+            unsigned long index;
             index = entry->second.index;
             pal[3 * index]     = (unsigned char)(key >> 16);
             pal[3 * index + 1] = (unsigned char)(key >> 8);
diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index de2bab1d76..af6848426d 100644
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -97,9 +97,10 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     if (c=='2') // Ascii GREY
     {
-        wxUint32 value, size=width*height;
+        wxUint32 size=width*height;
         for (wxUint32 i=0; i<size; ++i)
         {
+            wxUint32 value;
             value=text_stream.Read32();
             if ( maxval != 255 )
                 value = (255 * value)/maxval;
@@ -118,11 +119,12 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     }
     if (c=='3') // Ascii RBG
     {
-        wxUint32 value, size=3*width*height;
+        wxUint32 size=3*width*height;
         for (wxUint32 i=0; i<size; ++i)
           {
             //this is very slow !!!
             //I wonder how we can make any better ?
+            wxUint32 value;
             value=text_stream.Read32();
             if ( maxval != 255 )
                 value = (255 * value)/maxval;
@@ -141,9 +143,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     if (c=='5') // Raw GREY
     {
         wxUint32 size=width*height;
-        unsigned char value;
         for (wxUint32 i=0; i<size; ++i)
         {
+            unsigned char value;
             buf_stream.Read(&value,1);
             if ( maxval != 255 )
                 value = (255 * value)/maxval;
diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp
index 5b5ec55259..9184c7fb8f 100644
--- a/src/common/imagtga.cpp
+++ b/src/common/imagtga.cpp
@@ -106,7 +106,6 @@ int DecodeRLE(unsigned char* imageData, unsigned long imageSize,
                short pixelSize, wxInputStream& stream)
 {
     unsigned long outputLength = 0;
-    unsigned char current;
     unsigned int length;
     unsigned char buf[4];
 
@@ -116,6 +115,7 @@ int DecodeRLE(unsigned char* imageData, unsigned long imageSize,
         if ( ch == wxEOF )
             return wxTGA_IOERR;
 
+        unsigned char current;
         current = ch;
 
         // RLE packet.
@@ -233,7 +233,7 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
 
     const short pixelSize = bpp / 8;
 
-    const unsigned long imageSize = width * height * pixelSize;
+    const unsigned long imageSize = static_cast<unsigned long>(width) * height * pixelSize;
 
     wxScopedArray<unsigned char> imageData(imageSize);
 
@@ -373,10 +373,9 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
 
                 case 16:
                 {
-                    unsigned char temp;
-
                     for (unsigned long index = 0; index < imageSize; index += pixelSize)
                     {
+                        unsigned char temp;
                         temp = (imageData[index + 1] & 0x7c) << 1;
                         temp |= temp >> 5;
                         *(dst++) = temp;
@@ -571,10 +570,9 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
 
                 case 16:
                 {
-                    unsigned char temp;
-
                     for (unsigned long index = 0; index < imageSize; index += pixelSize)
                     {
+                        unsigned char temp;
                         temp = (imageData[index + 1] & 0x7c) << 1;
                         temp |= temp >> 5;
                         *(dst++) = temp;
diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp
index 70f2bf7e48..ead815ed70 100644
--- a/src/common/listctrlcmn.cpp
+++ b/src/common/listctrlcmn.cpp
@@ -25,6 +25,7 @@
 #if wxUSE_LISTCTRL
 
 #include "wx/listctrl.h"
+#include "wx/imaglist.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
@@ -251,4 +252,43 @@ wxItemAttr *wxListCtrlBase::OnGetItemAttr(long item) const
         : NULL; // no attributes by default
 }
 
+wxString wxListCtrlBase::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
+{
+    // this is a pure virtual function, in fact - which is not really pure
+    // because the controls which are not virtual don't need to implement it
+    wxFAIL_MSG("wxListCtrl::OnGetItemText not supposed to be called");
+
+    return wxEmptyString;
+}
+
+bool wxListCtrlBase::OnGetItemIsChecked(long WXUNUSED(item)) const
+{
+    // this is a pure virtual function, in fact - which is not really pure
+    // because the controls which are not virtual don't need to implement it
+    wxFAIL_MSG("wxListCtrl::OnGetItemIsChecked not supposed to be called");
+
+    return false;
+}
+
+int wxListCtrlBase::OnGetItemImage(long WXUNUSED(item)) const
+{
+    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+                -1,
+                "List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden.");
+    return -1;
+}
+
+int wxListCtrlBase::OnGetItemColumnImage(long item, long column) const
+{
+    if ( !column )
+        return OnGetItemImage(item);
+
+    return -1;
+}
+
+wxItemAttr* wxListCtrlBase::OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
+{
+    return OnGetItemAttr(item);
+}
+
 #endif // wxUSE_LISTCTRL
diff --git a/src/common/log.cpp b/src/common/log.cpp
index 653c35cc3b..fe169a6b45 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -1066,7 +1066,8 @@ static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t sizeBuf, unsigned long
     LPVOID lpMsgBuf;
     if ( ::FormatMessage
          (
-            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+            FORMAT_MESSAGE_IGNORE_INSERTS,
             NULL,
             nErrCode,
             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
@@ -1075,9 +1076,11 @@ static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t sizeBuf, unsigned long
             NULL
          ) == 0 )
     {
+        wxLogDebug(wxS("FormatMessage failed with error 0x%lx in %s"),
+            GetLastError(), __WXFUNCTION__ ? __WXFUNCTION__ : "");
         // if this happens, something is seriously wrong, so don't use _() here
         // for safety
-        wxSprintf(szBuf, wxS("unknown error %lx"), nErrCode);
+        wxSprintf(szBuf, wxS("unknown error 0x%lx"), nErrCode);
         return szBuf;
     }
 
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 47428befa5..e62a8b3c3d 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -1087,10 +1087,10 @@ wxString wxMenuBarBase::GetHelpString(int itemid) const
 
 void wxMenuBarBase::UpdateMenus()
 {
-    wxMenu* menu;
     int nCount = GetMenuCount();
     for (int n = 0; n < nCount; n++)
     {
+        wxMenu* menu;
         menu = GetMenu( n );
         if (menu != NULL)
             menu->UpdateUI();
diff --git a/src/common/overlaycmn.cpp b/src/common/overlaycmn.cpp
index 4ea0de9a7a..b20b1af543 100644
--- a/src/common/overlaycmn.cpp
+++ b/src/common/overlaycmn.cpp
@@ -94,13 +94,18 @@ wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width
 wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxDC *dc) :
     m_overlay(overlay)
 {
-    const wxRect device(wxPoint(0, 0), dc->GetSize());
+    const wxSize size(dc->GetSize());
+
+    const wxCoord logicalLeft = dc->DeviceToLogicalX(0);
+    const wxCoord logicalTop = dc->DeviceToLogicalY(0);
+    const wxCoord logicalRight = dc->DeviceToLogicalX(size.GetWidth());
+    const wxCoord logicalBottom = dc->DeviceToLogicalY(size.GetHeight());
 
     Init(dc,
-         dc->DeviceToLogicalX(device.GetLeft()),
-         dc->DeviceToLogicalY(device.GetTop()),
-         dc->DeviceToLogicalX(device.GetRight()),
-         dc->DeviceToLogicalY(device.GetBottom()));
+         logicalLeft,
+         logicalTop,
+         logicalRight - logicalLeft,
+         logicalBottom - logicalTop);
 }
 
 wxDCOverlay::~wxDCOverlay()
diff --git a/src/common/powercmn.cpp b/src/common/powercmn.cpp
index a546a4d00a..65d0b6c288 100644
--- a/src/common/powercmn.cpp
+++ b/src/common/powercmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index ffe0e0f086..ce6ace14bc 100644
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -117,6 +117,11 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
 
     result.clear();
 
+    // Although we're supposed to get 7-bit ASCII from the server, some FTP
+    // servers are known to send 8-bit data, so we try to decode it in
+    // any way that works as this is more useful than just throwing it away.
+    wxWhateverWorksConv conv;
+
     wxCharBuffer buf(LINE_BUF);
     char *pBuf = buf.data();
     while ( sock->WaitForRead() )
@@ -168,7 +173,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             return wxPROTO_NETERR;
 
         pBuf[nRead] = '\0';
-        result += wxString::FromAscii(pBuf);
+        result += conv.cMB2WX(pBuf);
 
         if ( eol )
         {
diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 17f7cfccc3..d9151a67ed 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     13.07.01
 // Copyright:   (c) 2000 Karsten Ballueder <ballueder@gmx.net>
-//                  2001 Vadim Zeitlin <vadim@wxwindows.org>
+//                  2001 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/rendcmn.cpp b/src/common/rendcmn.cpp
index 455d2d5ac8..2fa54d1d54 100644
--- a/src/common/rendcmn.cpp
+++ b/src/common/rendcmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.07.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index c9c011d5f7..c02d3e5f11 100644
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -66,3 +66,36 @@ void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
 {
     ms_screen = screen;
 }
+
+// ----------------------------------------------------------------------------
+// Trivial wxSystemAppearance implementation
+// ----------------------------------------------------------------------------
+
+#if !defined(__WXOSX__)
+
+wxString wxSystemAppearance::GetName() const
+{
+    return wxString();
+}
+
+bool wxSystemAppearance::IsDark() const
+{
+    return IsUsingDarkBackground();
+}
+
+#endif // !__WXOSX__
+
+bool wxSystemAppearance::IsUsingDarkBackground() const
+{
+    const wxColour bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+    const wxColour fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+
+    // The threshold here is rather arbitrary, but it seems that using just
+    // inequality would be wrong as it could result in false positivies.
+    return fg.GetLuminance() - bg.GetLuminance() > 0.2;
+}
+
+wxSystemAppearance wxSystemSettingsNative::GetAppearance()
+{
+    return wxSystemAppearance();
+}
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 651af1c48f..d34ad21eec 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2071,7 +2071,10 @@ wxSizerItem *wxBoxSizer::DoInsert(size_t index, wxSizerItem *item)
             );
         }
 
-        if ( flags & wxEXPAND )
+        // Note that using alignment with wxEXPAND can make sense if wxSHAPED
+        // is also used, as the item doesn't necessarily fully expand in the
+        // other direction in this case.
+        if ( (flags & wxEXPAND) && !(flags & wxSHAPED) )
         {
             wxASSERT_MSG
             (
@@ -2097,7 +2100,7 @@ wxSizerItem *wxBoxSizer::DoInsert(size_t index, wxSizerItem *item)
             );
         }
 
-        if ( flags & wxEXPAND )
+        if ( (flags & wxEXPAND) && !(flags & wxSHAPED) )
         {
             wxASSERT_MSG(
                 !(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)),
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 207b3c9751..eb971f952f 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -529,7 +529,7 @@ wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
     WX_SOCKLEN_T fromlen = sizeof(from);
     const wxSOCKET_T fd = accept(m_fd, &from.addr, &fromlen);
 
-    wxScopeGuard closeSocket = wxMakeGuard(wxClose, fd);
+    wxScopeGuard closeSocket = wxMakeGuard(wxCloseSocket, fd);
 
     // accepting is similar to reading in the sense that it resets "ready for
     // read" flag on the socket
diff --git a/src/common/sstream.cpp b/src/common/sstream.cpp
index 2ab8557bbc..6407e82aa6 100644
--- a/src/common/sstream.cpp
+++ b/src/common/sstream.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Ryan Norton (UTF8 UNICODE)
 // Created:     2004-09-19
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 6f776c30d4..8a8e112b14 100644
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 560322317a..e839a3a0d3 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1195,7 +1195,6 @@ size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n,
     while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n)))
     {
         const char *opsz = psz;
-        bool invalid = false;
         unsigned char cc = *psz++, fc = cc;
         unsigned cnt;
         for (cnt = 0; fc & 0x80; cnt++)
@@ -1219,6 +1218,7 @@ size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n,
         }
         else
         {
+            bool invalid = false;
             cnt--;
             if (!cnt)
             {
diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index f2f7109f28..178634000f 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -1338,9 +1338,9 @@ wxString wxTarOutputStream::PaxHeaderPath(const wxString& format,
     ret.reserve(format.length() + path.length() + 16);
 
     size_t begin = 0;
-    size_t end;
 
     for (;;) {
+        size_t end;
         end = format.find('%', begin);
         if (end == wxString::npos || end + 1 >= format.length())
             break;
diff --git a/src/common/textentrycmn.cpp b/src/common/textentrycmn.cpp
index 1979b8ca61..ad9a516ebb 100644
--- a/src/common/textentrycmn.cpp
+++ b/src/common/textentrycmn.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxTextEntryBase 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index bf92ed2942..97162940ac 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -1478,9 +1478,9 @@ wxTranslations::~wxTranslations()
     delete m_loader;
 
     // free catalogs memory
-    wxMsgCatalog *pTmpCat;
     while ( m_pMsgCat != NULL )
     {
+        wxMsgCatalog* pTmpCat;
         pTmpCat = m_pMsgCat;
         m_pMsgCat = m_pMsgCat->m_pNext;
         delete pTmpCat;
diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 49c0151b97..d1493de28d 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -154,11 +154,11 @@ wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
 wxTreeEvent::wxTreeEvent(const wxTreeEvent & event)
            : wxNotifyEvent(event)
     , m_evtKey(event.m_evtKey)
+    , m_item(event.m_item)
+    , m_itemOld(event.m_itemOld)
     , m_pointDrag(event.m_pointDrag)
     , m_label(event.m_label)
 {
-    m_item = event.m_item;
-    m_itemOld = event.m_itemOld;
     m_editCancelled = event.m_editCancelled;
 }
 
diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index d174e4e13f..c38f7c29ab 100644
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -108,7 +108,7 @@ wxChar wxTextInputStream::GetChar()
             // actually read the next character
             m_lastBytes[inlen] = m_input.GetC();
 
-            if(m_input.LastRead() <= 0)
+            if (m_input.LastRead() == 0)
                 return 0;
 
             m_validEnd++;
@@ -303,12 +303,24 @@ wxString wxTextInputStream::ReadLine()
 {
     wxString line;
 
-    while ( !m_input.Eof() )
+    for ( ;; )
     {
         wxChar c = GetChar();
-        if (!c)
+        if ( m_input.Eof() )
             break;
 
+        if (!c)
+        {
+            // If we failed to get a character and the stream is not at EOF, it
+            // can only mean that decoding the stream contents using our
+            // conversion object failed. In this case, we must signal an error
+            // at the stream level, as otherwise the code using this function
+            // would never know that something went wrong and would continue
+            // calling it again and again, resulting in an infinite loop.
+            m_input.Reset(wxSTREAM_READ_ERROR);
+            break;
+        }
+
         if (EatEOL(c))
             break;
 
@@ -358,7 +370,7 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
 wxTextInputStream& wxTextInputStream::operator>>(char& c)
 {
     c = m_input.GetC();
-    if(m_input.LastRead() <= 0) c = 0;
+    if (m_input.LastRead() == 0) c = 0;
 
     if (EatEOL(c))
         c = '\n';
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 456dc1b38a..2206f3d895 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -613,14 +613,7 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output)
     // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
     is->Reset();
 
-    // Notice that wxTextInputStream doesn't work correctly with wxConvAuto
-    // currently, see #14720, so use the current locale conversion explicitly
-    // under assumption that any external program should be using it too.
-    wxTextInputStream tis(*is, " \t"
-#if wxUSE_UNICODE
-                                    , wxConvLibc
-#endif
-                                                );
+    wxTextInputStream tis(*is);
 
     for ( ;; )
     {
@@ -1442,7 +1435,7 @@ wxVersionInfo wxGetLibraryVersionInfo()
                          wxMINOR_VERSION,
                          wxRELEASE_NUMBER,
                          msg,
-                         wxS("Copyright (c) 1995-2018 wxWidgets team"));
+                         wxS("Copyright (c) 1995-2019 wxWidgets team"));
 }
 
 void wxInfoMessageBox(wxWindow* parent)
diff --git a/src/common/validate.cpp b/src/common/validate.cpp
index bfe7f66287..4383a0dc67 100644
--- a/src/common/validate.cpp
+++ b/src/common/validate.cpp
@@ -23,8 +23,6 @@
     #include "wx/window.h"
 #endif
 
-const wxValidator wxDefaultValidator;
-
 wxIMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler);
 
 // VZ: personally, I think true would be more appropriate - these bells are
@@ -39,6 +37,10 @@ wxValidator::wxValidator()
 wxValidator::~wxValidator()
 {
 }
+#else
 
-#endif
-  // wxUSE_VALIDATORS
+class WXDLLIMPEXP_CORE wxValidator { };
+
+#endif // wxUSE_VALIDATORS
+
+const wxValidator wxDefaultValidator;
diff --git a/src/common/valnum.cpp b/src/common/valnum.cpp
index c2522d1075..ecfb6c5186 100644
--- a/src/common/valnum.cpp
+++ b/src/common/valnum.cpp
@@ -178,10 +178,22 @@ void wxNumValidatorBase::OnChar(wxKeyEvent& event)
 
 void wxNumValidatorBase::OnKillFocus(wxFocusEvent& event)
 {
+    event.Skip();
+
     wxTextEntry * const control = GetTextEntry();
     if ( !control )
         return;
 
+    const wxString& valueNorm = NormalizeString(control->GetValue());
+    if ( control->GetValue() == valueNorm )
+    {
+        // Don't do anything at all if the value doesn't really change, even if
+        // the control optimizes away the calls to ChangeValue() which don't
+        // actually change it, it's easier to skip all the complications below
+        // if we don't need to do anything.
+        return;
+    }
+
     // When we change the control value below, its "modified" status is reset
     // so we need to explicitly keep it marked as modified if it was so in the
     // first place.
@@ -191,12 +203,10 @@ void wxNumValidatorBase::OnKillFocus(wxFocusEvent& event)
     wxTextCtrl * const text = wxDynamicCast(m_validatorWindow, wxTextCtrl);
     const bool wasModified = text ? text->IsModified() : false;
 
-    control->ChangeValue(NormalizeString(control->GetValue()));
+    control->ChangeValue(valueNorm);
 
     if ( wasModified )
         text->MarkDirty();
-
-    event.Skip();
 }
 
 // ============================================================================
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 75546b07b4..e30516a1f2 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -678,7 +678,7 @@ bool wxVariant::GetBool() const
     else
     {
         wxFAIL_MSG(wxT("Could not convert to a bool"));
-        return 0;
+        return false;
     }
 }
 
diff --git a/src/common/wrapsizer.cpp b/src/common/wrapsizer.cpp
index 155eb95341..0efdbbaa9d 100644
--- a/src/common/wrapsizer.cpp
+++ b/src/common/wrapsizer.cpp
@@ -465,7 +465,11 @@ void wxWrapSizer::CalcMinFromMinor(int totMinor)
 
         // No spill over?
         if ( !tailSize )
+        {
+            // Add minor size of the last line
+            sumMinor += maxMinor;
             break;
+        }
     }
 
     // Now have min size in the opposite direction
diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 7c7df92bad..b0571819fc 100644
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -526,9 +526,6 @@ static unsigned char ParseHexadecimal(char digit1, char digit2)
 static bool GetRGBFromName(const char *inname, bool *isNone,
                            unsigned char *r, unsigned char*g, unsigned char *b)
 {
-    int left, right, middle;
-    int cmp;
-    wxUint32 rgbVal;
     char *name;
     char *grey, *p;
 
@@ -583,14 +580,18 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
         found = false;
 
         // binary search:
+        int left, right;
         left = 0;
         right = numTheRGBRecords - 1;
         do
         {
+            int middle;
             middle = (left + right) / 2;
+            int cmp;
             cmp = strcmp(name, theRGBRecords[middle].name);
             if ( cmp == 0 )
             {
+                wxUint32 rgbVal;
                 rgbVal = theRGBRecords[middle].rgb;
                 *r = (unsigned char)((rgbVal >> 16) & 0xFF);
                 *g = (unsigned char)((rgbVal >> 8) & 0xFF);
@@ -663,7 +664,6 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
     unsigned width, height, colors_cnt, chars_per_pixel;
     size_t i, j, i_key;
     char key[64];
-    const char *clr_def;
     wxXPMColourMap clr_tbl;
     wxXPMColourMap::iterator it;
     wxString maskKey;
@@ -709,6 +709,7 @@ wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
 
         for (i_key = 0; i_key < chars_per_pixel; i_key++)
             key[i_key] = xmpColLine[i_key];
+        const char *clr_def;
         clr_def = ParseColor(xmpColLine + chars_per_pixel);
 
         if ( clr_def == NULL )
diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index 60bcdcffda..a4d1a74372 100644
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implements wxGenericAboutBox() function
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 58cd06ab8a..d0f8434168 100644
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -86,15 +86,36 @@ void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 
     // create the colour dialog and display it
     wxColourDialog dlg(this, &ms_data);
+    dlg.Bind(wxEVT_COLOUR_CHANGED, &wxGenericColourButton::OnColourChanged, this);
+
+    wxEventType eventType;
     if (dlg.ShowModal() == wxID_OK)
     {
         ms_data = dlg.GetColourData();
         SetColour(ms_data.GetColour());
 
-        // fire an event
-        wxColourPickerEvent event(this, GetId(), m_colour);
-        GetEventHandler()->ProcessEvent(event);
+        eventType = wxEVT_COLOURPICKER_CHANGED;
     }
+    else
+    {
+        eventType = wxEVT_COLOURPICKER_DIALOG_CANCELLED;
+    }
+
+    // Fire the corresponding event: note that we want it to appear as
+    // originating from our parent, which is the user-visible window, and not
+    // this button itself, which is just an implementation detail.
+    wxWindow* const parent = GetParent();
+    wxColourPickerEvent event(parent, parent->GetId(), m_colour, eventType);
+
+    ProcessWindowEvent(event);
+}
+
+void wxGenericColourButton::OnColourChanged(wxColourDialogEvent& ev)
+{
+    wxWindow* const parent = GetParent();
+    wxColourPickerEvent event(parent, parent->GetId(), ev.GetColour(),
+                              wxEVT_COLOURPICKER_CURRENT_CHANGED);
+    parent->ProcessWindowEvent(event);
 }
 
 void wxGenericColourButton::UpdateColour()
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index d398cc1c5a..12cc27d81c 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -71,8 +71,6 @@ class wxDataViewCtrl;
 // constants
 //-----------------------------------------------------------------------------
 
-static const int SCROLL_UNIT_X = 15;
-
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 
@@ -1298,7 +1296,7 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     if (m_toggle)
         flags |= wxCONTROL_CHECKED;
     if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE ||
-        GetEnabled() == false)
+        !(GetOwner()->GetOwner()->IsEnabled() && GetEnabled()))
         flags |= wxCONTROL_DISABLED;
 
     // Ensure that the check boxes always have at least the minimal required
@@ -2510,11 +2508,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
     for (unsigned int i = col_start; i < col_last; i++)
     {
         wxDataViewColumn *col = GetOwner()->GetColumnAt( i );
+        if ( col->IsHidden() )
+            continue;       // skip it!
+
         wxDataViewRenderer *cell = col->GetRenderer();
         cell_rect.width = col->GetWidth();
-
-        if ( col->IsHidden() || cell_rect.width <= 0 )
-            continue;       // skip it!
+        if ( cell_rect.width <= 0 )
+            continue;
 
         cell_rect.y = first_line_start;
         for (unsigned int item = item_start; item < item_last; item++)
@@ -3110,9 +3110,12 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
 
     int x, y;
     m_owner->GetScrollPixelsPerUnit( &x, &y );
-    int sy = GetLineStart( rows )/y;
+
+    // Take care to not divide by 0 if we're somehow called before scrolling
+    // parameters are initialized.
+    int sy = y ? GetLineStart( rows )/y : -1;
     int sx = -1;
-    if( column != -1 )
+    if( column != -1 && x )
     {
         wxRect rect = GetClientRect();
         int colnum = 0;
@@ -5174,7 +5177,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
     sizer->Add( m_clientArea, 1, wxGROW );
     SetSizer( sizer );
 
-    EnableSystemTheme();
+    EnableSystemThemeByDefault();
 
 #if wxUSE_ACCESSIBILITY
     wxAccessible::NotifyEvent(wxACC_EVENT_OBJECT_CREATE, this, wxOBJID_CLIENT, wxACC_SELF);
diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 9787ed6fc6..503fba2d44 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1471,7 +1471,7 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
 
     // a and b are not used
     //double a, b;
-    double c, d, x1, y1, x2, y2, x3, y3;
+    double c, d, x1, y1, x3, y3;
     wxPoint *p, *q;
 
     wxPointList::compatibility_iterator node = points->GetFirst();
@@ -1509,6 +1509,7 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
     node = node->GetNext();
     while (node)
     {
+        double x2, y2;
         q = node->GetData();
 
         x1 = x3;
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a193972da3..f79ad3035a 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1304,16 +1304,17 @@ void wxGridStringTable::SetValue( int row, int col, const wxString& value )
 
 void wxGridStringTable::Clear()
 {
-    int row, col;
-    int numRows, numCols;
-
+    int numRows;
     numRows = m_data.GetCount();
     if ( numRows > 0 )
     {
+        int numCols;
         numCols = m_data[0].GetCount();
 
+        int row;
         for ( row = 0; row < numRows; row++ )
         {
+            int col;
             for ( col = 0; col < numCols; col++ )
             {
                 m_data[row][col].clear();
@@ -3167,10 +3168,10 @@ wxArrayInt wxGrid::CalcColLabelsExposed( const wxRegion& reg ) const
 
         // find the cells within these bounds
         //
-        int col;
         int colPos;
         for ( colPos = GetColPos( internalXToCol(left) ); colPos < m_numCols; colPos++ )
         {
+            int col;
             col = GetColAt( colPos );
 
             if ( GetColRight(col) < left )
@@ -5355,11 +5356,11 @@ void wxGrid::DrawGridCellArea( wxDC& dc, const wxGridCellCoordsArray& cells )
         return;
 
     int i, numCells = cells.GetCount();
-    int row, col, cell_rows, cell_cols;
     wxGridCellCoordsArray redrawCells;
 
     for ( i = numCells - 1; i >= 0; i-- )
     {
+        int row, col, cell_rows, cell_cols;
         row = cells[i].GetRow();
         col = cells[i].GetCol();
         GetCellSize( row, col, &cell_rows, &cell_cols );
@@ -6141,12 +6142,12 @@ void wxGrid::DrawTextRectangle(wxDC& dc,
 void wxGrid::StringToLines( const wxString& value, wxArrayString& lines ) const
 {
     int startPos = 0;
-    int pos;
     wxString eol = wxTextFile::GetEOL( wxTextFileType_Unix );
     wxString tVal = wxTextFile::Translate( value, wxTextFileType_Unix );
 
     while ( startPos < (int)tVal.length() )
     {
+        int pos;
         pos = tVal.Mid(startPos).Find( eol );
         if ( pos < 0 )
         {
@@ -6774,7 +6775,6 @@ bool wxGrid::IsVisible( int row, int col, bool wholeCellVisible ) const
 //
 void wxGrid::MakeCellVisible( int row, int col )
 {
-    int i;
     int xpos = -1, ypos = -1;
 
     if ( row >= 0 && row < m_numRows &&
@@ -6799,6 +6799,7 @@ void wxGrid::MakeCellVisible( int row, int col )
         {
             int h = r.GetHeight();
             ypos = r.GetTop();
+            int i;
             for ( i = row - 1; i >= 0; i-- )
             {
                 int rowHeight = GetRowHeight(i);
@@ -8818,6 +8819,12 @@ wxPen& wxGrid::GetDividerPen() const
 
 void wxGrid::SetCellValue( int row, int col, const wxString& s )
 {
+    if ( s == GetCellValue(row, col) )
+    {
+        // Avoid flicker by not doing anything in this case.
+        return;
+    }
+
     if ( m_table )
     {
         m_table->SetValue( row, col, s );
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index e4f8df8ffd..f6df548502 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -597,10 +597,9 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
     int hAlign, vAlign;
     attr.GetAlignment(&hAlign, &vAlign);
 
-    int overflowCols = 0;
-
     if (attr.GetOverflow())
     {
+        int overflowCols = 0;
         int cols = grid.GetNumberCols();
         int best_width = GetBestSize(grid,attr,dc,row,col).GetWidth();
         int cell_rows, cell_cols;
diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp
index f8a3eb7871..8b1226a879 100644
--- a/src/generic/grideditors.cpp
+++ b/src/generic/grideditors.cpp
@@ -1750,6 +1750,15 @@ struct wxGridCellDateEditorKeyHandler
     }
 
     wxGridCellEditorEvtHandler* m_handler;
+
+#ifdef wxNO_RTTI
+    // wxEventFunctorFunction used when an object of this class is passed to
+    // Bind() must have a default ctor when using wx RTTI implementation (see
+    // see the comment before WX_DECLARE_TYPEINFO_INLINE() in wx/typeinfo.h)
+    // and this, in turn, requires a default ctor of this class -- which will
+    // never be actually used, but must nevertheless exist.
+    wxGridCellDateEditorKeyHandler() : m_handler(NULL) { }
+#endif // wxNO_RTTI
 };
 #endif // __WXGTK__
 
diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 971c2ee875..a8928b63f3 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -349,9 +349,9 @@ bool wxExtHelpController::DisplaySection(int sectionNo)
 
     wxBusyCursor b; // display a busy cursor
     wxList::compatibility_iterator node = m_MapList->GetFirst();
-    wxExtHelpMapEntry *entry;
     while (node)
     {
+        wxExtHelpMapEntry* entry;
         entry = (wxExtHelpMapEntry *)node->GetData();
         if (entry->entryid == sectionNo)
             return DisplayHelp(entry->url);
diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index cc7ef82ac1..011f6cc557 100644
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 93084375a1..9d383497ec 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index c60d83f45e..b76844b4bf 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1681,6 +1681,11 @@ void wxListMainWindow::CacheLineData(size_t line)
         ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));
     }
 
+    if ( HasCheckBoxes() )
+    {
+        ld->Check(listctrl->OnGetItemIsChecked(line));
+    }
+
     ld->SetAttr(listctrl->OnGetItemAttr(line));
 }
 
@@ -3129,10 +3134,13 @@ void wxListMainWindow::SetImageList( wxImageList *imageList, int which )
     m_dirty = true;
 
     // calc the spacing from the icon size
-    int width = 0, height = 0;
+    int width = 0;
 
     if ((imageList) && (imageList->GetImageCount()) )
+    {
+        int height;
         imageList->GetSize(0, width, height);
+    }
 
     if (which == wxIMAGE_LIST_NORMAL)
     {
@@ -4052,16 +4060,16 @@ void wxListMainWindow::DeleteItem( long lindex )
         //  we're deleting contain the Max Column Width
         wxListLineData * const line = GetLine(index);
         wxListItemDataList::compatibility_iterator n;
-        wxListItemData *itemData;
         wxListItem      item;
-        int             itemWidth;
 
         for (size_t i = 0; i < m_columns.GetCount(); i++)
         {
             n = line->m_items.Item( i );
+            wxListItemData* itemData;
             itemData = n->GetData();
             itemData->GetItem(item);
 
+            int itemWidth;
             itemWidth = GetItemWidthWithImage(&item);
 
             wxColWidthInfo *pWidthInfo = m_aColWidths.Item(i);
@@ -5530,31 +5538,6 @@ wxSize wxGenericListCtrl::DoGetBestClientSize() const
 // virtual list control support
 // ----------------------------------------------------------------------------
 
-wxString wxGenericListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
-{
-    // this is a pure virtual function, in fact - which is not really pure
-    // because the controls which are not virtual don't need to implement it
-    wxFAIL_MSG( wxT("wxGenericListCtrl::OnGetItemText not supposed to be called") );
-
-    return wxEmptyString;
-}
-
-int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
-{
-    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
-                -1,
-                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
-    return -1;
-}
-
-int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
-{
-    if (!column)
-        return OnGetItemImage(item);
-
-   return -1;
-}
-
 void wxGenericListCtrl::SetItemCount(long count)
 {
     wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
diff --git a/src/generic/mask.cpp b/src/generic/mask.cpp
index 27fbbc6e96..173e18a5af 100644
--- a/src/generic/mask.cpp
+++ b/src/generic/mask.cpp
@@ -3,7 +3,7 @@
 // Purpose:     generic wxMask implementation
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/notifmsgg.cpp b/src/generic/notifmsgg.cpp
index 34ed4828ba..4b1d27db4f 100644
--- a/src/generic/notifmsgg.cpp
+++ b/src/generic/notifmsgg.cpp
@@ -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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 90ee529cdb..9d135700e1 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp
index 1905538a08..ae0fcd7119 100644
--- a/src/generic/richtooltipg.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -667,9 +667,6 @@ void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font)
 
 void wxRichToolTipGenericImpl::ShowFor(wxWindow* win, const wxRect* rect)
 {
-    // Set the focus to the window the tooltip refers to to make it look active.
-    win->SetFocus();
-
     wxRichToolTipPopup* const popup = new wxRichToolTipPopup
                                           (
                                             win,
diff --git a/src/generic/selstore.cpp b/src/generic/selstore.cpp
index af2dd12a41..72a5169ef2 100644
--- a/src/generic/selstore.cpp
+++ b/src/generic/selstore.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
-// Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 6d0f120f46..761aa65e20 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -709,21 +709,21 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point,
             if ((point.x >= m_x) && (point.x <= m_x+m_width))
             {
                 int image_w = -1;
-                int image_h;
 
                 // assuming every image (normal and selected) has the same size!
                 if ( (GetImage() != NO_IMAGE) && theCtrl->m_imageListNormal )
                 {
+                    int image_h;
                     theCtrl->m_imageListNormal->GetSize(GetImage(),
                                                         image_w, image_h);
                 }
 
                 int state_w = -1;
-                int state_h;
 
                 if ( (GetState() != wxTREE_ITEMSTATE_NONE) &&
                         theCtrl->m_imageListState )
                 {
+                    int state_h;
                     theCtrl->m_imageListState->GetSize(GetState(),
                                                        state_w, state_h);
                 }
@@ -3419,18 +3419,20 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
 
     if ( textOnly )
     {
-        int image_h = 0, image_w = 0;
+        int image_w = 0;
         int image = ((wxGenericTreeItem*) item.m_pItem)->GetCurrentImage();
         if ( image != NO_IMAGE && m_imageListNormal )
         {
+            int image_h;
             m_imageListNormal->GetSize( image, image_w, image_h );
             image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
         }
 
-        int state_h = 0, state_w = 0;
+        int state_w = 0;
         int state = ((wxGenericTreeItem*) item.m_pItem)->GetState();
         if ( state != wxTREE_ITEMSTATE_NONE && m_imageListState )
         {
+            int state_h;
             m_imageListState->GetSize( state, state_w, state_h );
             if ( image_w != 0 )
                 state_w += MARGIN_BETWEEN_STATE_AND_IMAGE;
diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 79f03a9bc0..a02517e649 100644
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index 995f4d2c7a..af2b11d236 100644
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, David Warkentin
 // Created:     30.05.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index 8f00bead0e..6bc9a010bc 100644
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -3,7 +3,7 @@
 // Purpose:     native GTK+ wxAboutBox() implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 97c4bc93e9..ce72ff150a 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -260,7 +260,7 @@ bool wxButton::DoSetLabelMarkup(const wxString& markup)
     if ( stripped.empty() && !markup.empty() )
         return false;
 
-    wxControl::SetLabel(stripped);
+    SetLabel(stripped);
 
     GtkLabel * const label = GTKGetLabel();
     wxCHECK_MSG( label, false, "no label in this button?" );
diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 1777b25a06..b1daebc085 100644
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -593,6 +593,12 @@ void wxClipboard::Clear()
     m_formatSupported = false;
 }
 
+bool wxClipboard::Flush()
+{
+    gtk_clipboard_store( gtk_clipboard_get( GTKGetClipboardAtom() ) );
+    return true;
+}
+
 bool wxClipboard::Open()
 {
     wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );
diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index 856421e94e..54f01a4d09 100644
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -50,8 +50,11 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
 #endif
     p->GTKSetColour(gdkColor);
 
-    // fire the colour-changed event
-    wxColourPickerEvent event(p, p->GetId(), p->GetColour());
+    // Fire the corresponding event: note that we want it to appear as
+    // originating from our parent, which is the user-visible window, and not
+    // this button itself, which is just an implementation detail.
+    wxWindow* const parent = p->GetParent();
+    wxColourPickerEvent event(parent, parent->GetId(), p->GetColour());
     p->HandleWindowEvent(event);
 }
 }
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index d17c2dd2fd..f4e14017b1 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -4099,15 +4099,6 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
     }
     else
     {
-        if (iter == NULL)
-        {
-            if (m_root->GetChildCount() == 0) return FALSE;
-            iter->stamp = m_gtk_model->stamp;
-            iter->user_data = (gpointer) m_root->GetChildren().Item( 0 );
-            return TRUE;
-        }
-
-
         wxDataViewItem item;
         if (parent)
             item = wxDataViewItem( (void*) parent->user_data );
diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 61fd25ee2c..bf5f38f943 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -18,91 +18,6 @@
 #include "wx/gtk/private/wrapgtk.h"
 #include <gdk/gdkx.h>
 
-#if WXWIN_COMPATIBILITY_2_8
-
-//-----------------------------------------------------------------------------
-// "realize" from m_wxwindow: used to create m_glContext implicitly
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void
-gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
-{
-    win->GTKInitImplicitContext();
-}
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-//-----------------------------------------------------------------------------
-// "map" from m_wxwindow
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK3__
-extern "C" {
-static void
-gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
-{
-    wxPaintEvent event( win->GetId() );
-    event.SetEventObject( win );
-    win->HandleWindowEvent( event );
-
-    win->m_exposed = false;
-    win->GetUpdateRegion().Clear();
-}
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// "expose_event" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-extern "C" {
-#ifdef __WXGTK3__
-static gboolean draw(GtkWidget*, cairo_t* cr, wxGLCanvas* win)
-{
-    win->m_exposed = true;
-    if (win->m_cairoPaintContext == NULL)
-    {
-        win->m_cairoPaintContext = cr;
-        cairo_reference(cr);
-    }
-    double x1, y1, x2, y2;
-    cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-    win->GetUpdateRegion().Union(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
-    return false;
-}
-#else
-static gboolean
-gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
-{
-    win->m_exposed = true;
-
-    win->GetUpdateRegion().Union( gdk_event->area.x,
-                                  gdk_event->area.y,
-                                  gdk_event->area.width,
-                                  gdk_event->area.height );
-    return false;
-}
-#endif
-}
-
-//-----------------------------------------------------------------------------
-// "size_allocate" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void
-gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
-                           GtkAllocation * WXUNUSED(alloc),
-                           wxGLCanvas *win)
-{
-    wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
-    event.SetEventObject( win );
-    win->HandleWindowEvent( event );
-}
-}
-
 //-----------------------------------------------------------------------------
 // emission hook for "parent-set"
 //-----------------------------------------------------------------------------
@@ -273,11 +188,8 @@ bool wxGLCanvas::Create(wxWindow *parent,
 #endif // wxUSE_PALETTE
     wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0
 
-    m_exposed = false;
-    m_noExpose = true;
     m_nativeSizeEvent = true;
 #ifdef __WXGTK3__
-    m_cairoPaintContext = NULL;
     m_backgroundStyle = wxBG_STYLE_PAINT;
 #endif
 
@@ -294,30 +206,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
 
     gtk_widget_set_double_buffered(m_wxwindow, false);
 
-#if WXWIN_COMPATIBILITY_2_8
-    g_signal_connect(m_wxwindow, "realize",       G_CALLBACK(gtk_glwindow_realized_callback), this);
-#endif // WXWIN_COMPATIBILITY_2_8
-#ifdef __WXGTK3__
-    g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this);
-#else
-    g_signal_connect(m_wxwindow, "map",           G_CALLBACK(gtk_glwindow_map_callback),      this);
-    g_signal_connect(m_wxwindow, "expose_event",  G_CALLBACK(gtk_glwindow_expose_callback),   this);
-#endif
-    g_signal_connect(m_widget,   "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback),     this);
-
-#if WXWIN_COMPATIBILITY_2_8
-    // if our parent window is already visible, we had been realized before we
-    // connected to the "realize" signal and hence our m_glContext hasn't been
-    // initialized yet and we have to do it now
-    if (gtk_widget_get_realized(m_wxwindow))
-        gtk_glwindow_realized_callback( m_wxwindow, this );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-#ifndef __WXGTK3__
-    if (gtk_widget_get_mapped(m_wxwindow))
-        gtk_glwindow_map_callback( m_wxwindow, this );
-#endif
-
     return true;
 }
 
@@ -332,25 +220,14 @@ Window wxGLCanvas::GetXWindow() const
     return window ? GDK_WINDOW_XID(window) : 0;
 }
 
-void wxGLCanvas::OnInternalIdle()
+void wxGLCanvas::GTKHandleRealized()
 {
-    if (m_exposed)
-    {
-#ifdef __WXGTK3__
-        GTKSendPaintEvents(m_cairoPaintContext);
-        cairo_destroy(m_cairoPaintContext);
-        m_cairoPaintContext = NULL;
-#else
-        wxPaintEvent event( GetId() );
-        event.SetEventObject( this );
-        HandleWindowEvent( event );
+    BaseType::GTKHandleRealized();
+
+#if WXWIN_COMPATIBILITY_2_8
+    GTKInitImplicitContext();
 #endif
-
-        m_exposed = false;
-        GetUpdateRegion().Clear();
-    }
-
-    wxWindow::OnInternalIdle();
+    SendSizeEvent();
 }
 
 #if WXWIN_COMPATIBILITY_2_8
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 954fb060a0..095bbe4e35 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -677,12 +677,12 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
     aSelections.Empty();
 
-    int i = 0;
     GtkTreeIter iter;
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(m_liststore), &iter))
     { //gtk_tree_selection_get_selected_rows is GTK 2.2+ so iter instead
+        int i = 0;
         do
         {
             if (gtk_tree_selection_iter_is_selected(selection, &iter))
diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index b342f7f13d..923b8f4b89 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -128,8 +128,6 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
-    if (win->m_isDragging) return TRUE;
-
     int style = win->GetWindowStyle();
 
     int y = (int)gdk_event->y;
@@ -138,20 +136,11 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
     if ((style & wxRESIZE_BORDER) &&
         (x > win->m_width-14) && (y > win->m_height-14))
     {
-        GtkWidget *ancestor = gtk_widget_get_toplevel( widget );
-
-        GdkWindow *source = gtk_widget_get_window(widget);
-
-        int org_x = 0;
-        int org_y = 0;
-        gdk_window_get_origin( source, &org_x, &org_y );
-
-        gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
-                                  GDK_WINDOW_EDGE_SOUTH_EAST,
-                                  1,
-                                  org_x + x,
-                                  org_y + y,
-                                  0);
+        gtk_window_begin_resize_drag(GTK_WINDOW(win->m_widget),
+            GDK_WINDOW_EDGE_SOUTH_EAST,
+            gdk_event->button,
+            int(gdk_event->x_root), int(gdk_event->y_root),
+            gdk_event->time);
 
         return TRUE;
     }
@@ -170,74 +159,10 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
 
     gdk_window_raise(gtk_widget_get_window(win->m_widget));
 
-#ifdef __WXGTK4__
-    gdk_seat_grab(
-        gdk_event_get_seat((GdkEvent*)gdk_event), gdk_event_get_window((GdkEvent*)gdk_event),
-        GDK_SEAT_CAPABILITY_POINTER, false, NULL, (GdkEvent*)gdk_event, NULL, 0);
-#else
-    const GdkEventMask mask = GdkEventMask(
-        GDK_BUTTON_PRESS_MASK |
-        GDK_BUTTON_RELEASE_MASK |
-        GDK_POINTER_MOTION_MASK |
-        GDK_POINTER_MOTION_HINT_MASK |
-        GDK_BUTTON_MOTION_MASK |
-        GDK_BUTTON1_MOTION_MASK);
-#ifdef __WXGTK3__
-    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
-    gdk_device_grab(
-        gdk_event->device, gdk_event->window, GDK_OWNERSHIP_NONE,
-        false, mask, NULL, gdk_event->time);
-    wxGCC_WARNING_RESTORE()
-#else
-    gdk_pointer_grab(gdk_event->window, false, mask, NULL, NULL, gdk_event->time);
-#endif
-#endif // !__WXGTK4__
-
-    win->m_diffX = x;
-    win->m_diffY = y;
-    win->m_oldX = 0;
-    win->m_oldY = 0;
-
-    win->m_isDragging = true;
-
-    return TRUE;
-}
-}
-
-//-----------------------------------------------------------------------------
-// "button_release_event" of m_mainWidget
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static gboolean
-gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)
-{
-    if (gdk_event->window != gtk_widget_get_window(widget))
-        return false;
-    if (g_blockEventsOnDrag) return TRUE;
-    if (g_blockEventsOnScroll) return TRUE;
-    if (!win->m_isDragging) return TRUE;
-
-    win->m_isDragging = false;
-
-    int x = (int)gdk_event->x;
-    int y = (int)gdk_event->y;
-
-#ifdef __WXGTK4__
-    gdk_seat_ungrab(gdk_event_get_seat((GdkEvent*)gdk_event));
-#elif defined(__WXGTK3__)
-    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
-    gdk_device_ungrab(gdk_event->device, gdk_event->time);
-    wxGCC_WARNING_RESTORE()
-#else
-    gdk_pointer_ungrab(gdk_event->time);
-#endif
-    int org_x = 0;
-    int org_y = 0;
-    gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
-    x += org_x - win->m_diffX;
-    y += org_y - win->m_diffY;
-    gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
+    gtk_window_begin_move_drag(GTK_WINDOW(win->m_widget),
+        gdk_event->button,
+        int(gdk_event->x_root), int(gdk_event->y_root),
+        gdk_event->time);
 
     return TRUE;
 }
@@ -279,16 +204,6 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
     int x = int(gdk_event->x);
     int y = int(gdk_event->y);
 
-    if (gdk_event->is_hint)
-    {
-#ifdef __WXGTK3__
-       gdk_window_get_device_position(gdk_event->window, gdk_event->device, &x, &y, NULL);
-#else
-       gdk_window_get_pointer(gdk_event->window, &x, &y, NULL);
-#endif
-    }
-
-    if (!win->m_isDragging)
     {
         if (win->GetWindowStyle() & wxRESIZE_BORDER)
         {
@@ -309,19 +224,8 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
 #endif
             }
         }
-        return TRUE;
     }
 
-    win->m_oldX = x - win->m_diffX;
-    win->m_oldY = y - win->m_diffY;
-
-    int org_x = 0;
-    int org_y = 0;
-    gdk_window_get_origin(gtk_widget_get_window(widget), &org_x, &org_y);
-    x += org_x - win->m_diffX;
-    y += org_y - win->m_diffY;
-    gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
-
     return TRUE;
 }
 }
@@ -359,11 +263,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
         m_miniEdge = 4;
     else
         m_miniEdge = 3;
-    m_isDragging = false;
-    m_oldX = -1;
-    m_oldY = -1;
-    m_diffX = 0;
-    m_diffY = 0;
 
     // don't allow sizing smaller than decorations
     int minWidth = 2 * m_miniEdge;
@@ -378,9 +277,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     // Use a GtkEventBox for the title and borders. Using m_widget for this
     // almost works, except that setting the resize cursor has no effect.
     GtkWidget* eventbox = gtk_event_box_new();
-    gtk_widget_add_events(eventbox,
-        GDK_POINTER_MOTION_MASK |
-        GDK_POINTER_MOTION_HINT_MASK);
+    gtk_widget_add_events(eventbox, GDK_POINTER_MOTION_MASK);
     gtk_widget_show(eventbox);
 #ifdef __WXGTK3__
     g_object_ref(m_mainWidget);
@@ -406,9 +303,9 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     m_gdkDecor = 0;
     gtk_window_set_decorated(GTK_WINDOW(m_widget), false);
-    m_gdkFunc = 0;
+    m_gdkFunc = GDK_FUNC_MOVE;
     if (style & wxRESIZE_BORDER)
-       m_gdkFunc = GDK_FUNC_RESIZE;
+       m_gdkFunc |= GDK_FUNC_RESIZE;
     gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
     memset(&m_decorSize, 0, sizeof(m_decorSize));
     m_deferShow = false;
@@ -434,8 +331,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     /* these are required for dragging the mini frame around */
     g_signal_connect (eventbox, "button_press_event",
                       G_CALLBACK (gtk_window_button_press_callback), this);
-    g_signal_connect (eventbox, "button_release_event",
-                      G_CALLBACK (gtk_window_button_release_callback), this);
     g_signal_connect (eventbox, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);
     g_signal_connect (eventbox, "leave_notify_event",
diff --git a/src/gtk/mnemonics.cpp b/src/gtk/mnemonics.cpp
index 3f99009b61..6e69a52ec0 100644
--- a/src/gtk/mnemonics.cpp
+++ b/src/gtk/mnemonics.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of GTK mnemonics conversion functions
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 8bba19c685..2710e4317f 100644
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxNativeWindow implementation
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 247d294f9e..4dc2dad80c 100644
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -214,7 +214,7 @@ static GtkPaperSize* wxGetGtkPaperSize(wxPaperSize paperId, const wxSize& size)
     // last resort, use a custom GtkPaperSize
     const wxString title = _("Custom size");
     char name[40];
-    g_snprintf(name, sizeof(name), "custom_%ux%u", size.x, size.y);
+    g_snprintf(name, sizeof(name), "custom_%dx%d", size.x, size.y);
     return gtk_paper_size_new_custom(
         name, title.utf8_str(), size.x, size.y, GTK_UNIT_MM);
 }
@@ -1699,7 +1699,7 @@ void wxGtkPrinterDCImpl::DoDrawSpline(const wxPointList *points)
 {
     SetPen (m_pen);
 
-    double c, d, x1, y1, x2, y2, x3, y3;
+    double c, d, x1, y1, x3, y3;
     wxPoint *p, *q;
 
     wxPointList::compatibility_iterator node = points->GetFirst();
@@ -1726,6 +1726,7 @@ void wxGtkPrinterDCImpl::DoDrawSpline(const wxPointList *points)
     node = node->GetNext();
     while (node)
     {
+        double x2, y2;
         q = node->GetData();
 
         x1 = x3;
diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index cac350e8cb..73e3272058 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index fbbe942ab8..d4d1eccae8 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -975,16 +975,6 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
             return dclick;
 
         case wxSYS_CARET_ON_MSEC:
-            {
-                gint blink_time = -1;
-                g_object_get(GetSettingsForWindowScreen(window),
-                                "gtk-cursor-blink-time", &blink_time, NULL);
-                if (blink_time > 0)
-                    return blink_time / 2;
-
-                return -1;
-            }
-
         case wxSYS_CARET_OFF_MSEC:
             {
                 gboolean should_blink = true;
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index fe47602ac6..54af9c1def 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -409,11 +409,12 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
     gtk_text_iter_forward_char(&end);
 
     wxGtkString text(gtk_text_iter_get_text( &start, &end ));
-    size_t len = strlen(text), prefix_len;
+    size_t len = strlen(text);
     size_t n;
 
     for( n = 0; n < WXSIZEOF(URIPrefixes); ++n )
     {
+        size_t prefix_len;
         prefix_len = strlen(URIPrefixes[n]);
         if((len > prefix_len) && !wxStrnicmp(text, URIPrefixes[n], prefix_len))
             break;
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 824514fed6..598d7593a0 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxTextEntry implementation for wxGTK
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -570,12 +570,16 @@ void wxTextEntry::DoSetValue(const wxString& value, int flags)
             EventsSuppressor noevents(this);
             WriteText(value);
         }
+
+        // Changing the value is supposed to reset the insertion point. Note,
+        // however, that this does not happen if the text doesn't really change.
+        SetInsertionPoint(0);
     }
 
+    // OTOH we must send the event even if the text didn't really change for
+    // consistency.
     if ( flags & SetValue_SendEvent )
         SendTextUpdatedEvent(GetEditableWindow());
-
-    SetInsertionPoint(0);
 }
 
 wxString wxTextEntry::DoGetValue() const
diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index df9733c111..a4fa9e3e29 100644
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -181,7 +181,31 @@ image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool)
 #endif
 {
 #ifdef __WXGTK3__
-    const wxBitmap& bitmap = tool->GetBitmap();
+    wxBitmap bitmap(tool->GetNormalBitmap());
+    if (!tool->IsEnabled())
+    {
+        wxBitmap disabled(tool->GetDisabledBitmap());
+        // if no disabled bitmap and normal bitmap is scaled
+        if (!disabled.IsOk() && bitmap.IsOk() && bitmap.GetScaleFactor() > 1)
+        {
+            // make scaled disabled bitmap from normal one
+
+            disabled.CreateScaled(bitmap.GetScaledHeight(), bitmap.GetScaledWidth(),
+                32, bitmap.GetScaleFactor());
+            cairo_t* cr2 = disabled.CairoCreate();
+            // clear to transparent
+            cairo_set_operator(cr2, CAIRO_OPERATOR_SOURCE);
+            cairo_set_source_rgba(cr2, 0, 0, 0, 0);
+            cairo_paint(cr2);
+            // draw in normal bitmap
+            bitmap.Draw(cr2, 0, 0);
+            // create disabled appearance, this seems to be how GTK does it
+            cairo_set_source_rgba(cr2, 0, 0, 0, 0);
+            cairo_paint_with_alpha(cr2, 0.5);
+            cairo_destroy(cr2);
+        }
+        bitmap = disabled;
+    }
     if (!bitmap.IsOk() || (tool->IsEnabled() && bitmap.GetScaleFactor() <= 1))
         return false;
 #else
@@ -276,11 +300,10 @@ void wxToolBarTool::SetImage()
 #ifdef __WXGTK3__
     if (bitmap.GetScaleFactor() > 1)
     {
-        // Use a scaled pixbuf with the correct logical size. It will be used
-        // for the disabled state if no disabled bitmap is specifed, otherwise
-        // the original will be used by our "draw" signal handler.
-        GdkPixbuf* pixbuf = gdk_pixbuf_scale_simple(bitmap.GetPixbuf(),
-            bitmap.GetScaledWidth(), bitmap.GetScaledHeight(), GDK_INTERP_BILINEAR);
+        // Use a placeholder pixbuf with the correct size.
+        // The original will be used by our "draw" signal handler.
+        GdkPixbuf* pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8,
+            bitmap.GetScaledWidth(), bitmap.GetScaledHeight());
         gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
         g_object_unref(pixbuf);
     }
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 375912170f..2ff5c94b07 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2271,7 +2271,6 @@ size_allocate(GtkWidget* WXUNUSED_IN_GTK2(widget), GtkAllocation* alloc, wxWindo
         // so always get size from m_widget->allocation
         win->m_width  = a.width;
         win->m_height = a.height;
-        if (!win->m_nativeSizeEvent)
         {
             wxSizeEvent event(win->GetSize(), win->GetId());
             event.SetEventObject(win);
@@ -3666,6 +3665,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
         // priority slightly higher than GDK_PRIORITY_EVENTS
         g_source_set_priority(source, GDK_PRIORITY_EVENTS - 1);
         g_source_attach(source, NULL);
+        g_source_unref(source);
     }
 
     g_signal_connect (widget, "key_press_event",
@@ -4768,25 +4768,25 @@ void wxWindowGTK::RealizeTabOrder()
                 {
                     if ( focusableFromKeyboard )
                     {
-                        // wxComboBox et al. needs to focus on on a different
-                        // widget than m_widget, so if the main widget isn't
-                        // focusable try the connect widget
+                        // We may need to focus on the connect widget if the
+                        // main one isn't focusable, but note that we still use
+                        // the main widget if neither it nor connect widget is
+                        // focusable, without this using a wxStaticText before
+                        // wxChoice wouldn't work at all, for example.
                         GtkWidget* w = win->m_widget;
                         if ( !gtk_widget_get_can_focus(w) )
                         {
-                            w = win->GetConnectWidget();
-                            if ( !gtk_widget_get_can_focus(w) )
-                                w = NULL;
+                            GtkWidget* const cw = win->GetConnectWidget();
+                            if ( cw != w && gtk_widget_get_can_focus(cw) )
+                                w = cw;
                         }
 
-                        if ( w )
-                        {
-                            mnemonicWindow->GTKWidgetDoSetMnemonic(w);
-                            mnemonicWindow = NULL;
-                        }
+                        mnemonicWindow->GTKWidgetDoSetMnemonic(w);
+                        mnemonicWindow = NULL;
                     }
                 }
-                else if ( win->GTKWidgetNeedsMnemonic() )
+
+                if ( win->GTKWidgetNeedsMnemonic() )
                 {
                     mnemonicWindow = win;
                 }
diff --git a/src/gtk1/mnemonics.cpp b/src/gtk1/mnemonics.cpp
index d3baad174a..2140ae767a 100644
--- a/src/gtk1/mnemonics.cpp
+++ b/src/gtk1/mnemonics.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of GTK mnemonics conversion functions
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 3c1f8aac68..657c627596 100644
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 3a93267e49..05af129704 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -732,10 +732,10 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
     if (!has_non_ascii)
     {
       wxFileSystem fsys;
-      wxFSFile *f;
       // 1. try to open given file:
       for (i = 0; i < cnt; i++)
       {
+        wxFSFile *f;
         f = fsys.OpenFile(m_bookRecords[i].GetFullPath(x));
         if (f)
         {
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 88dca44361..aa1d9d8ed7 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -861,9 +861,9 @@ bool wxHtmlHelpWindow::KeywordSearch(const wxString& keyword,
                                   wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
 #endif
 
-        int curi;
         while (status.IsActive())
         {
+            int curi;
             curi = status.GetCurIndex();
             if (curi % 32 == 0
 #if wxUSE_PROGRESSDLG
@@ -1092,13 +1092,13 @@ void wxHtmlHelpWindow::ReadCustomization(wxConfigBase *cfg, const wxString& path
     m_FontSize = cfg->Read(wxT("hcBaseFontSize"), m_FontSize);
 
     {
-        int i;
         int cnt;
         wxString val, s;
 
         cnt = cfg->Read(wxT("hcBookmarksCnt"), 0L);
         if (cnt != 0)
         {
+            int i;
             m_BookmarksNames.Clear();
             m_BookmarksPages.Clear();
             if (m_Bookmarks)
@@ -1296,7 +1296,6 @@ wxEND_EVENT_TABLE()
 void wxHtmlHelpWindow::OptionsDialog()
 {
     wxHtmlHelpWindowOptionsDialog dlg(this);
-    unsigned i;
 
     if (m_NormalFonts == NULL)
     {
@@ -1331,6 +1330,7 @@ void wxHtmlHelpWindow::OptionsDialog()
     // Lock updates to the choice controls before inserting potentially many
     // items into them until the end of this block.
     {
+        unsigned i;
         wxWindowUpdateLocker lockNormalFont(dlg.NormalFont);
         wxWindowUpdateLocker lockFixedFont(dlg.FixedFont);
 
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 465bdc60d7..8532699459 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -292,8 +292,8 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 wxIMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell);
 
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell()
+    , m_Word(word)
 {
-    m_Word = word;
     wxCoord w, h, d;
     dc.GetTextExtent(m_Word, &w, &h, &d);
     m_Width = w;
@@ -730,8 +730,8 @@ void wxHtmlContainerCell::Layout(int w)
 
     wxHtmlCell *nextCell;
     long xpos = 0, ypos = m_IndentTop;
-    int xdelta = 0, ybasicpos = 0, ydiff;
-    int s_width, nextWordWidth, s_indent;
+    int xdelta = 0, ybasicpos = 0;
+    int s_width, s_indent;
     int ysizeup = 0, ysizedown = 0;
     int MaxLineWidth = 0;
     int curLineWidth = 0;
@@ -784,6 +784,7 @@ void wxHtmlContainerCell::Layout(int w)
             case wxHTML_ALIGN_BOTTOM :   ybasicpos = - cell->GetHeight(); break;
             case wxHTML_ALIGN_CENTER :   ybasicpos = - cell->GetHeight() / 2; break;
         }
+        int ydiff;
         ydiff = cell->GetHeight() + ybasicpos;
 
         if (cell->GetDescent() + ydiff > ysizedown) ysizedown = cell->GetDescent() + ydiff;
@@ -809,6 +810,7 @@ void wxHtmlContainerCell::Layout(int w)
         cell = cell->GetNext();
 
         // compute length of the next word that would be added:
+        int nextWordWidth;
         nextWordWidth = 0;
         if (cell)
         {
@@ -1322,9 +1324,9 @@ wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
 {
     if ( m_Cells )
     {
-        wxHtmlCell *c2;
         for (wxHtmlCell *c = m_Cells; c; c = c->GetNext())
         {
+            wxHtmlCell *c2;
             c2 = c->GetFirstTerminal();
             if ( c2 )
                 return c2;
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 8d97ab74f6..ac04fcd7b6 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -150,7 +150,6 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
     if (end_pos <= begin_pos)
         return;
 
-    wxChar c;
     wxString::const_iterator i = begin_pos;
     wxString::const_iterator textBeginning = begin_pos;
 
@@ -165,6 +164,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
 
     while (i < end_pos)
     {
+        wxChar c;
         c = *i;
 
         if (c == wxT('<'))
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 617309a56f..d3373316a5 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -454,7 +454,6 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
     if (m_Processors || m_GlobalProcessors)
     {
         wxHtmlProcessorList::compatibility_iterator nodeL, nodeG;
-        int prL, prG;
 
         if ( m_Processors )
             nodeL = m_Processors->GetFirst();
@@ -468,6 +467,7 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
         //     in every iteration
         while (nodeL || nodeG)
         {
+            int prL, prG;
             prL = (nodeL) ? nodeL->GetData()->GetPriority() : -1;
             prG = (nodeG) ? nodeG->GetData()->GetPriority() : -1;
             if (prL > prG)
diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 109db31967..cb77dd675d 100644
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -86,10 +86,10 @@ TAG_HANDLER_BEGIN(FONT, "FONT" )
                 m_Faces = wxFontEnumerator::GetFacenames();
 
             wxStringTokenizer tk(faces, wxT(","));
-            int index;
 
             while (tk.HasMoreTokens())
             {
+                int index;
                 if ((index = m_Faces.Index(tk.GetNextToken(), false)) != wxNOT_FOUND)
                 {
                     m_WParser->SetFontFace(m_Faces[index]);
diff --git a/src/motif/textentry.cpp b/src/motif/textentry.cpp
index 3d79807d6c..8b62f7184b 100644
--- a/src/motif/textentry.cpp
+++ b/src/motif/textentry.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxTextEntry for wxMotif
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/aboutdlg.cpp b/src/msw/aboutdlg.cpp
index 5b100b81ae..6eaef62439 100644
--- a/src/msw/aboutdlg.cpp
+++ b/src/msw/aboutdlg.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxAboutBox() for wxMSW
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp
index c2daf84c7d..4dca1adf94 100644
--- a/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@ -1156,31 +1156,16 @@ void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state)
     ::GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
                             TMT_CONTENTMARGINS, &rectBtn, &margins);
     ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight);
-    ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
 
     if ( button->UseBgCol() && iState != PBS_HOT )
     {
         COLORREF colBg = wxColourToRGB(button->GetBackgroundColour());
         AutoHBRUSH hbrushBackground(colBg);
 
-        // don't overwrite the focus rect
-        RECT rectClient;
-        ::CopyRect(&rectClient, &rectBtn);
-        ::InflateRect(&rectClient, -1, -1);
-
-        if ( wxGetWinVersion() >= wxWinVersion_10 )
-        {
-            // buttons have flat appearance so we can fully color them
-            // even outside the "safe" rectangle
-            SelectInHDC brush(hdc, hbrushBackground);
-            COLORREF colTheme = GetPixel(hdc, rectClient.left, rectClient.top);
-            ExtFloodFill(hdc, rectClient.left, rectClient.top, colTheme, FLOODFILLSURFACE);
-        }
-        else
-        {
-            FillRect(hdc, &rectClient, hbrushBackground);
-        }
+        FillRect(hdc, &rectBtn, hbrushBackground);
     }
+
+    ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
 }
 #endif // wxUSE_UXTHEME
 
diff --git a/src/msw/basemsw.cpp b/src/msw/basemsw.cpp
index 5cf06c48b6..640c76265c 100644
--- a/src/msw/basemsw.cpp
+++ b/src/msw/basemsw.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index ae3cf19601..c9df03a590 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -252,14 +252,26 @@ wxWindow *wxButton::SetDefault()
 // return NULL
 static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
 {
-    wxWindow* const parent = wxGetTopLevelParent(win);
-    wxASSERT_MSG( parent, wxT("button without top level parent?") );
+    for ( ;; )
+    {
+        // IsTopLevel() will return false for a wxTLW being deleted, so we also
+        // need the parent test for this case
+        wxWindow * const parent = win->GetParent();
+        if ( !parent || win->IsTopLevel() )
+        {
+            if ( win->IsBeingDeleted() )
+                return NULL;
 
-    if ( parent->IsBeingDeleted() )
-        return NULL;
+            break;
+        }
+
+        win = parent;
+    }
+
+    wxASSERT_MSG( win, wxT("button without top level parent?") );
 
     // Note that this may still return null for a button inside wxPopupWindow.
-    return wxDynamicCast(parent, wxTopLevelWindow);
+    return wxDynamicCast(win, wxTopLevelWindow);
 }
 
 // set this button as being currently default
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index f6c3300232..753bccc335 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -246,15 +246,10 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
     {
         MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
-        wxSize size = wxRendererNative::Get().GetCheckBoxSize(this);
-        size.x += 2 * CHECKMARK_EXTRA_SPACE;
-        size.y += 2 * CHECKMARK_EXTRA_SPACE;
-
-        // add place for the check mark
-        pStruct->itemWidth += size.GetWidth();
-
-        if ( pStruct->itemHeight < static_cast<unsigned int>(size.GetHeight()) )
-            pStruct->itemHeight = size.GetHeight();
+        const wxSize size = MSWGetFullItemSize(pStruct->itemWidth,
+                                                 pStruct->itemHeight);
+        pStruct->itemWidth = size.x;
+        pStruct->itemHeight = size.y;
 
         return true;
     }
@@ -422,20 +417,25 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
     }
 }
 
+wxSize wxCheckListBox::MSWGetFullItemSize(int w, int h) const
+{
+    wxSize size = wxRendererNative::Get().GetCheckBoxSize(const_cast<wxCheckListBox*>(this));
+    size.x += 2 * CHECKMARK_EXTRA_SPACE;
+    size.y += 2 * CHECKMARK_EXTRA_SPACE;
+
+    w += size.GetWidth();
+    if ( h < size.GetHeight() )
+        h = size.GetHeight();
+
+    return wxSize(w, h);
+}
+
 wxSize wxCheckListBox::DoGetBestClientSize() const
 {
     wxSize best = wxListBox::DoGetBestClientSize();
 
     // add room for the checkbox
-    wxSize size = wxRendererNative::Get().GetCheckBoxSize(const_cast<wxCheckListBox*>(this));
-    size.x += 2 * CHECKMARK_EXTRA_SPACE;
-    size.y += 2 * CHECKMARK_EXTRA_SPACE;
-
-    best.x += size.GetWidth();
-    if ( best.y < size.GetHeight() )
-        best.y = size.GetHeight();
-
-    return best;
+    return MSWGetFullItemSize(best.x, best.y);
 }
 
 #endif // wxUSE_CHECKLISTBOX
diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index fb9c89d16c..c8e48b5470 100644
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -37,6 +37,8 @@
     #include "wx/math.h"
 #endif
 
+#include "wx/scopeguard.h"
+
 #include "wx/msw/private.h"
 
 #include <stdlib.h>
@@ -51,6 +53,9 @@
 // and "Define Custom Colors" extension not shown
 static wxRect gs_rectDialog(0, 0, 222, 324);
 
+// The dialog currently being shown or null.
+static wxColourDialog* gs_activeDialog = NULL;
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -61,6 +66,53 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog);
 // implementation
 // ============================================================================
 
+#ifndef COLORBOXES
+    #define COLORBOXES 64
+#endif
+
+// Undocumented property storing the COLORINFO struct in the standard dialog.
+#ifndef COLORPROP
+    #define COLORPROP (LPCTSTR) 0xA000L
+#endif
+
+namespace
+{
+
+// The private and undocumented Windows structure used by the standard dialog.
+// See https://social.msdn.microsoft.com/Forums/en-US/c5fcfd9f-6b27-4848-bb9d-94bec105eabd/get-the-current-clicked-color-from-choosecolor-dialog?forum=windowsgeneraldevelopmentissues
+struct COLORINFO
+{
+    UINT           ApiType;
+    LPCHOOSECOLOR  pCC;
+    HANDLE         hLocal;
+    HANDLE         hDialog;
+    HPALETTE       hPal;
+    DWORD          currentRGB;
+    WORD           currentHue;
+    WORD           currentSat;
+    WORD           currentLum;
+    WORD           nHueWidth;
+    WORD           nSatHeight;
+    WORD           nLumHeight;
+    WORD           nCurMix;
+    WORD           nCurDsp;
+    WORD           nCurBox;
+    WORD           nHuePos;
+    WORD           nSatPos;
+    WORD           nLumPos;
+    RECT           rOriginal;
+    RECT           rRainbow;
+    RECT           rLumScroll;
+    RECT           rLumPaint;
+    RECT           rCurrentColor;
+    RECT           rNearestPure;
+    RECT           rColorSamples;
+    BOOL           bFoldOut;
+    DWORD          rgbBoxColor[COLORBOXES];
+};
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // colour dialog hook proc
 // ----------------------------------------------------------------------------
@@ -69,19 +121,30 @@ UINT_PTR CALLBACK
 wxColourDialogHookProc(HWND hwnd,
                        UINT uiMsg,
                        WPARAM WXUNUSED(wParam),
-                       LPARAM lParam)
+                       LPARAM WXUNUSED(lParam))
 {
-    if ( uiMsg == WM_INITDIALOG )
+    switch ( uiMsg )
     {
-        CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
-        wxColourDialog * const
-            dialog = reinterpret_cast<wxColourDialog *>(pCC->lCustData);
+        case WM_INITDIALOG:
+            {
+                const wxString title = gs_activeDialog->GetTitle();
+                if ( !title.empty() )
+                    ::SetWindowText(hwnd, title.t_str());
 
-        const wxString title = dialog->GetTitle();
-        if ( !title.empty() )
-            ::SetWindowText(hwnd, title.t_str());
+                gs_activeDialog->MSWOnInitDone((WXHWND)hwnd);
+            }
+            break;
 
-        dialog->MSWOnInitDone((WXHWND)hwnd);
+        default:
+            // Check if the currently selected colour changed.
+            //
+            // Doing it for all messages might be an overkill, we probably
+            // could only do it for keyboard/mouse ones.
+            if ( const COLORINFO* pCI = (COLORINFO*)::GetProp(hwnd, COLORPROP) )
+            {
+                gs_activeDialog->MSWCheckIfCurrentChanged(pCI->currentRGB);
+            }
+            break;
     }
 
     return 0;
@@ -135,9 +198,11 @@ int wxColourDialog::ShowModal()
             custColours[i] = RGB(255,255,255);
     }
 
+    m_currentCol = wxColourToRGB(m_colourData.GetColour());
+
     chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR);
     chooseColorStruct.hwndOwner = hWndParent;
-    chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.GetColour());
+    chooseColorStruct.rgbResult = m_currentCol;
     chooseColorStruct.lpCustColors = custColours;
 
     chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
@@ -147,6 +212,10 @@ int wxColourDialog::ShowModal()
     if ( m_colourData.GetChooseFull() )
         chooseColorStruct.Flags |= CC_FULLOPEN;
 
+    // Set the global pointer for the duration of the modal dialog life-time.
+    gs_activeDialog = this;
+    wxON_BLOCK_EXIT_NULL(gs_activeDialog);
+
     // do show the modal dialog
     if ( !::ChooseColor(&chooseColorStruct) )
     {
@@ -255,7 +324,7 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
 void wxColourDialog::MSWOnInitDone(WXHWND hDlg)
 {
     // set HWND so that our DoMoveWindow() works correctly
-    SetHWND(hDlg);
+    TempHWNDSetter set(this, hDlg);
 
     if ( m_centreDir )
     {
@@ -272,9 +341,17 @@ void wxColourDialog::MSWOnInitDone(WXHWND hDlg)
     {
         SetPosition(GetPosition());
     }
+}
 
-    // we shouldn't destroy hDlg, so disassociate from it
-    SetHWND(NULL);
+void wxColourDialog::MSWCheckIfCurrentChanged(WXCOLORREF currentCol)
+{
+    if ( currentCol == m_currentCol )
+        return;
+
+    m_currentCol = currentCol;
+
+    wxColourDialogEvent event(wxEVT_COLOUR_CHANGED, this, wxRGBToColour(currentCol));
+    ProcessWindowEvent(event);
 }
 
 #endif // wxUSE_COLOURDLG
diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 42a2437d9d..9854f59fc3 100644
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.03
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index a7d20ac984..c9d4e5279c 100644
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -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
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 51cf1fe9a5..ddeb2d6ba9 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1104,7 +1104,7 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
     const size_t n_bezier_points = n_points * 3 + 1;
     POINT *lppt = new POINT[n_bezier_points];
     size_t bezier_pos = 0;
-    wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4;
+    wxCoord x1, y1, x2, y2, cx1, cy1;
 
     wxPointList::compatibility_iterator node = points->GetFirst();
     wxPoint *p = node->GetData();
@@ -1135,6 +1135,7 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
     while ((node = node->GetNext()))
 #endif // !wxUSE_STD_CONTAINERS
     {
+        int cx4, cy4;
         p = (wxPoint *)node->GetData();
         x1 = x2;
         y1 = y2;
diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp
index 7aecd7f032..479919c397 100644
--- a/src/msw/debughlp.cpp
+++ b/src/msw/debughlp.cpp
@@ -3,7 +3,7 @@
 // Purpose:     various Win32 debug helpers
 // Author:      Vadim Zeitlin, Suzumizaki-kimitaka
 // Created:     2005-01-08 (extracted from crashrpt.cpp)
-// Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index eb0833f562..0850c7eca6 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 6fd48acd44..9f1892f07d 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -192,9 +192,11 @@ public:
     virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE;
     virtual int GetFromWindow(const wxWindow *window) wxOVERRIDE;
 
-    // Called when we receive WM_SETTINGCHANGE to refresh the list of monitor
-    // handles.
-    static void RefreshMonitors() { ms_factory->DoRefreshMonitors(); }
+    void InvalidateCache() wxOVERRIDE
+    {
+        wxDisplayFactory::InvalidateCache();
+        DoRefreshMonitors();
+    }
 
     // Declare the second argument as int to avoid problems with older SDKs not
     // declaring MONITOR_DPI_TYPE enum.
@@ -215,15 +217,9 @@ private:
     // return wxNOT_FOUND if not found
     int FindDisplayFromHMONITOR(HMONITOR hmon) const;
 
-    // Update m_displays array, used by RefreshMonitors().
+    // Update m_displays array, used initially and by InvalidateCache().
     void DoRefreshMonitors();
 
-
-    // The unique factory being used (as we don't have direct access to the
-    // global factory pointer in the common code so we just duplicate this
-    // variable (also making it of correct type for us) here).
-    static wxDisplayFactoryMSW* ms_factory;
-
     // The pointer to GetDpiForMonitorPtr(), retrieved on demand, and the
     // related data, including the DLL containing the function that we must
     // keep loaded.
@@ -279,7 +275,6 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryMSW);
 };
 
-wxDisplayFactoryMSW* wxDisplayFactoryMSW::ms_factory = NULL;
 wxDisplayFactoryMSW::GetDpiForMonitorData
     wxDisplayFactoryMSW::ms_getDpiForMonitorData;
 
@@ -529,9 +524,10 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
 LRESULT APIENTRY
 wxDisplayWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    if ( msg == WM_SETTINGCHANGE )
+    if ( (msg == WM_SETTINGCHANGE && wParam == SPI_SETWORKAREA) ||
+            msg == WM_DISPLAYCHANGE )
     {
-        wxDisplayFactoryMSW::RefreshMonitors();
+        wxDisplay::InvalidateCache();
 
         return 0;
     }
@@ -541,12 +537,6 @@ wxDisplayWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 
 wxDisplayFactoryMSW::wxDisplayFactoryMSW()
 {
-    // This is not supposed to happen with the current code, the factory is
-    // implicitly a singleton.
-    wxASSERT_MSG( !ms_factory, wxS("Using more than one factory?") );
-
-    ms_factory = this;
-
     m_hiddenHwnd = NULL;
     m_hiddenClass = NULL;
 
@@ -586,8 +576,6 @@ wxDisplayFactoryMSW::~wxDisplayFactoryMSW()
         ms_getDpiForMonitorData.UnloadIfNecessary();
         ms_getDpiForMonitorData.m_initialized = false;
     }
-
-    ms_factory = NULL;
 }
 
 /* static */
@@ -607,10 +595,10 @@ void wxDisplayFactoryMSW::DoRefreshMonitors()
 {
     m_displays.clear();
 
-    // We need to pass a valid HDC here in order to get valid hdcMonitor in our
-    // callback.
-    ScreenHDC dc;
-    if ( !::EnumDisplayMonitors(dc, NULL, MultimonEnumProc, (LPARAM)this) )
+    // Note that we pass NULL as first parameter here because using screen HDC
+    // doesn't work reliably: notably, it doesn't enumerate any displays if
+    // this code is executed while a UAC prompt is shown or during log-off.
+    if ( !::EnumDisplayMonitors(NULL, NULL, MultimonEnumProc, (LPARAM)this) )
     {
         wxLogLastError(wxT("EnumDisplayMonitors"));
     }
@@ -620,13 +608,24 @@ void wxDisplayFactoryMSW::DoRefreshMonitors()
 BOOL CALLBACK
 wxDisplayFactoryMSW::MultimonEnumProc(
     HMONITOR hMonitor,              // handle to display monitor
-    HDC hdcMonitor,                 // handle to monitor-appropriate device context
+    HDC /* hdcMonitor */,           // handle to monitor-appropriate device context:
+                                    // not set due to our use of EnumDisplayMonitors(NULL, ...)
     LPRECT WXUNUSED(lprcMonitor),   // pointer to monitor intersection rectangle
     LPARAM dwData)                  // data passed from EnumDisplayMonitors (this)
 {
     wxDisplayFactoryMSW *const self = (wxDisplayFactoryMSW *)dwData;
 
-    self->m_displays.push_back(wxDisplayInfo(hMonitor, wxGetHDCDepth(hdcMonitor)));
+    WinStruct<MONITORINFOEX> monInfo;
+    if ( !::GetMonitorInfo(hMonitor, &monInfo) )
+    {
+        wxLogLastError(wxT("GetMonitorInfo"));
+    }
+
+    HDC hdcMonitor = ::CreateDC(NULL, monInfo.szDevice, NULL, NULL);
+    const int hdcDepth = wxGetHDCDepth(hdcMonitor);
+    ::DeleteDC(hdcMonitor);
+
+    self->m_displays.push_back(wxDisplayInfo(hMonitor, hdcDepth));
 
     // continue the enumeration
     return TRUE;
diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index ff0bb127aa..849eb691e7 100644
--- a/src/msw/dlmsw.cpp
+++ b/src/msw/dlmsw.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-10 (partly extracted from common/dynlib.cpp)
-// Copyright:   (c) 1998-2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 1998-2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 5a0b7bd17a..1a3d3a5c91 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -185,6 +185,14 @@ wxFileDialogHookFunction(HWND      hDlg,
                         case CDN_SELCHANGE:
                             dialog->MSWOnSelChange((WXHWND)hDlg);
                             break;
+
+                        case CDN_TYPECHANGE:
+                            dialog->MSWOnTypeChange
+                                    (
+                                        (WXHWND)hDlg,
+                                        pNotifyCode->lpOFN->nFilterIndex
+                                    );
+                            break;
                     }
                 }
             }
@@ -312,7 +320,7 @@ void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
     HWND hFileDlg = ::GetParent((HWND)hDlg);
 
     // set HWND so that our DoMoveWindow() works correctly
-    SetHWND((WXHWND)hFileDlg);
+    TempHWNDSetter set(this, (WXHWND)hFileDlg);
 
     if ( m_centreDir )
     {
@@ -333,9 +341,6 @@ void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
     // Call selection change handler so that update handler will be
     // called once with no selection.
     MSWOnSelChange(hDlg);
-
-    // we shouldn't destroy this HWND
-    SetHWND(NULL);
 }
 
 void wxFileDialog::MSWOnSelChange(WXHWND hDlg)
@@ -353,6 +358,17 @@ void wxFileDialog::MSWOnSelChange(WXHWND hDlg)
         m_extraControl->UpdateWindowUI(wxUPDATE_UI_RECURSE);
 }
 
+void wxFileDialog::MSWOnTypeChange(WXHWND WXUNUSED(hDlg), int nFilterIndex)
+{
+    // Filter indices are 1-based, while we want to use 0-based index, as
+    // usual. However the input index can apparently also be 0 in some
+    // circumstances, so take care before decrementing it.
+    m_currentlySelectedFilterIndex = nFilterIndex ? nFilterIndex - 1 : 0;
+
+    if ( m_extraControl )
+        m_extraControl->UpdateWindowUI(wxUPDATE_UI_RECURSE);
+}
+
 // helper used below in ShowCommFileDialog(): style is used to determine
 // whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or
 // "Open file" one; returns true on success or false on failure in which case
@@ -402,11 +418,9 @@ static bool ShowCommFileDialog(OPENFILENAME *of, long style)
 
 void wxFileDialog::MSWOnInitDialogHook(WXHWND hwnd)
 {
-   SetHWND(hwnd);
+    TempHWNDSetter set(this, hwnd);
 
-   CreateExtraControl();
-
-   SetHWND(NULL);
+    CreateExtraControl();
 }
 
 int wxFileDialog::ShowModal()
@@ -571,6 +585,7 @@ int wxFileDialog::ShowModal()
 
     of.lpstrFilter  = filterBuffer.t_str();
     of.nFilterIndex = m_filterIndex + 1;
+    m_currentlySelectedFilterIndex = m_filterIndex;
 
     //=== Setting defaultFileName >>=========================================
 
diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index c4a773be0c..7f378c9a81 100644
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implements wrappers for GDI+ flat API
 // Author:      Vadim Zeitlin
 // Created:     2007-03-14
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 761477f833..f9b7bc15c5 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -116,7 +116,7 @@ void* wxJoystickThread::Entry()
         joyGetPos(m_joystick, &m_joyInfo);
         m_buttons = m_joyInfo.wButtons;
         UINT delta = m_buttons ^ m_lastJoyInfo.wButtons;
-        UINT deltaUp = delta & !m_buttons;
+        UINT deltaUp = delta & ~m_buttons;
         UINT deltaDown = delta & m_buttons;
 
         // Use count trailing zeros to determine which button changed.
@@ -261,7 +261,7 @@ int wxJoystick::GetButtonState() const
 
 bool wxJoystick::GetButtonState(unsigned id) const
 {
-    if (id > sizeof(int) * 8)
+    if (id >= sizeof(int) * 8)
         return false;
 
     return (GetButtonState() & (1 << id)) != 0;
diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 296447c61e..47d54e985e 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -596,7 +596,10 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
     }
 
     if ( largestExtent )
+    {
+        largestExtent = MSWGetFullItemSize(largestExtent, 0 /* height */).x;
         SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+    }
     //else: it shouldn't change
 }
 
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index c557c559f3..fc27322efc 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -302,7 +302,7 @@ bool wxListCtrl::Create(wxWindow *parent,
     if ( !MSWCreateControl(WC_LISTVIEW, wxEmptyString, pos, size) )
         return false;
 
-    EnableSystemTheme();
+    EnableSystemThemeByDefault();
 
     // explicitly say that we want to use Unicode because otherwise we get ANSI
     // versions of _some_ messages (notably LVN_GETDISPINFOA)
@@ -2480,6 +2480,33 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 event.m_item.m_data = GetItemData(iItem);
                 break;
 
+            case NM_CLICK:
+                processed = false;
+
+                // In virtual mode, check if user clicks on a checkbox.
+                if ( IsVirtual() && HasCheckBoxes() )
+                {
+                    LV_HITTESTINFO lvhti;
+                    wxZeroMemory(lvhti);
+
+                    wxGetCursorPosMSW(&(lvhti.pt));
+                    ::ScreenToClient(GetHwnd(), &lvhti.pt);
+
+                    if ( ListView_SubItemHitTest(GetHwnd(), &lvhti) != -1 )
+                    {
+                        if ( (lvhti.flags & LVHT_ONITEMSTATEICON) && (lvhti.iSubItem == 0) )
+                        {
+                            event.m_itemIndex = lvhti.iItem;
+                            if ( OnGetItemIsChecked(event.m_itemIndex) )
+                                eventType = wxEVT_LIST_ITEM_UNCHECKED;
+                            else
+                                eventType = wxEVT_LIST_ITEM_CHECKED;
+                            processed = true;
+                        }
+                    }
+                }
+                break;
+
             case NM_RCLICK:
                 // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(),
                 // don't do anything else
@@ -2669,8 +2696,14 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     // can get messages with LVIF_STATE in lvi.mask under Vista
                     if ( lvi.mask & LVIF_STATE )
                     {
-                        // we don't have anything to return from here...
                         lvi.stateMask = 0;
+
+                        if ( HasCheckBoxes() && (lvi.iSubItem == 0) )
+                        {
+                            const bool checked = OnGetItemIsChecked(item);
+                            lvi.state = INDEXTOSTATEIMAGEMASK(checked ? 2 : 1);
+                            lvi.stateMask = LVIS_STATEIMAGEMASK;
+                        }
                     }
 
                     return true;
@@ -2802,8 +2835,9 @@ bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont, int colCount)
     const int col = pLVCD->iSubItem;
     const DWORD item = nmcd.dwItemSpec;
 
-    // the font must be valid, otherwise we wouldn't be painting the item at all
-    SelectInHDC selFont(hdc, hfont);
+    SelectInHDC selFont;
+    if ( hfont )
+        selFont.Init(hdc, hfont);
 
     // get the rectangle to paint
     RECT rc;
@@ -3020,6 +3054,22 @@ static WXLPARAM HandleItemPrepaint(wxListCtrl *listctrl,
         return CDRF_NEWFONT;
     }
 
+    // For some unknown reason, native control incorrectly uses the active
+    // selection colour for the background of the items using COLOR_BTNFACE as
+    // their custom background even when the control doesn't have focus (see
+    // #17988). To work around this, draw the item ourselves in this case.
+    //
+    // Note that the problem doesn't arise when using system theme, which is
+    // lucky as HandleItemPaint() doesn't result in the same appearance as with
+    // the system theme, so we should avoid using it in this case to ensure
+    // that all items appear consistently.
+    if ( listctrl->IsSystemThemeDisabled() &&
+            pLVCD->clrTextBk == ::GetSysColor(COLOR_BTNFACE) )
+    {
+        HandleItemPaint(pLVCD, NULL);
+        return CDRF_SKIPDEFAULT;
+    }
+
     return CDRF_DODEFAULT;
 }
 
@@ -3240,31 +3290,6 @@ wxListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 // virtual list controls
 // ----------------------------------------------------------------------------
 
-wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
-{
-    // this is a pure virtual function, in fact - which is not really pure
-    // because the controls which are not virtual don't need to implement it
-    wxFAIL_MSG( wxT("wxListCtrl::OnGetItemText not supposed to be called") );
-
-    return wxEmptyString;
-}
-
-int wxListCtrl::OnGetItemImage(long WXUNUSED(item)) const
-{
-    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
-                -1,
-                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
-    return -1;
-}
-
-int wxListCtrl::OnGetItemColumnImage(long item, long column) const
-{
-    if (!column)
-        return OnGetItemImage(item);
-
-    return -1;
-}
-
 wxItemAttr *wxListCtrl::DoGetItemColumnAttr(long item, long column) const
 {
     if ( IsVirtual() )
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 1c53d8de1d..59691dfabe 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -787,11 +787,11 @@ bool wxMenuItem::OnMeasureItem(size_t *width, size_t *height)
 
     if ( IsOwnerDrawn() )
     {
-        *width  = data->ItemMargin.GetTotalX();
-        *height = data->ItemMargin.GetTotalY();
-
         if ( IsSeparator() )
         {
+            *width  = data->ItemMargin.GetTotalX();
+            *height = data->ItemMargin.GetTotalY();
+
             *width  += data->SeparatorSize.cx
                      + data->SeparatorMargin.GetTotalX();
             *height += data->SeparatorSize.cy
diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 6ffc80b43d..6da44d822b 100644
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -136,7 +136,7 @@ wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
         wnd->m_hook = NULL;
         HookMap().erase(tid);
 
-        wnd->SetHWND((HWND)wParam);
+        TempHWNDSetter set(wnd, (WXHWND)wParam);
 
         // replace the static text with an edit control if the message box is
         // too big to fit the display
@@ -151,9 +151,6 @@ wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
         if ( wnd->GetMessageDialogStyle() & wxCENTER )
             wnd->Center(); // center on parent
         //else: default behaviour, center on screen
-
-        // there seems to be no reason to leave it set
-        wnd->SetHWND(NULL);
     }
 
     return rc;
diff --git a/src/msw/nativewin.cpp b/src/msw/nativewin.cpp
index eb799345f6..8811064c4e 100644
--- a/src/msw/nativewin.cpp
+++ b/src/msw/nativewin.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxNativeWindow implementation
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index 9bced2bbf5..d40d13e96f 100644
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxNotificationMessage for Windows
 // Author:      Vadim Zeitlin
 // Created:     2007-12-01
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 17360fb899..0759f7b9c6 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -158,6 +158,7 @@ wxPenRefData::wxPenRefData()
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
              :wxGDIRefData()
+    , m_colour(data.m_colour)
 {
     m_style = data.m_style;
     m_width = data.m_width;
@@ -165,11 +166,12 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_cap = data.m_cap;
     m_nbDash = data.m_nbDash;
     m_dash = data.m_dash;
-    m_colour = data.m_colour;
     m_hPen = 0;
 }
 
 wxPenRefData::wxPenRefData(const wxPenInfo& info)
+    : m_stipple(info.GetStipple())
+    , m_colour(info.GetColour())
 {
     Init();
 
@@ -177,9 +179,7 @@ wxPenRefData::wxPenRefData(const wxPenInfo& info)
     m_width = info.GetWidth();
     m_join = info.GetJoin();
     m_cap = info.GetCap();
-    m_stipple = info.GetStipple();
     m_nbDash = info.GetDashes(&m_dash);
-    m_colour = info.GetColour();
 }
 
 wxPenRefData::~wxPenRefData()
diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 525fd29469..c3f42860f9 100644
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -119,10 +119,32 @@ void wxPopupWindow::SetFocus()
 
 bool wxPopupWindow::Show(bool show)
 {
+    // Note that we're called from the ctor before the window is actually
+    // created to hide the popup initially. This call doesn't really hide the
+    // window, so don't do anything in this case, in particular don't change
+    // wxCurrentPopupWindow value.
+    if ( !GetHwnd() )
+        return wxPopupWindowBase::Show(show);
+
     // It's important to update wxCurrentPopupWindow before showing the window,
-    // to ensure that it already set by the time the owner gets WM_NCACTIVATE
-    // from inside Show() so that it knows to remain [appearing] active.
-    wxCurrentPopupWindow = show ? this : NULL;
+    // to ensure that it's already set by the time the owner gets WM_NCACTIVATE
+    // from inside Show() so that it knows to remain [appearing] active, see
+    // the WM_NCACTIVATE handler in wxWindow::MSWHandleMessage().
+    if ( show )
+    {
+        // There could have been a previous popup window which hasn't been
+        // hidden yet. This will happen now, when we show this one, as it will
+        // result in activation loss for the other one, so it's ok to overwrite
+        // the old pointer, even if it's non-NULL.
+        wxCurrentPopupWindow = this;
+    }
+    else
+    {
+        // Only reset the pointer if it points to this window, otherwise we
+        // would lose the correct value in the situation described above.
+        if ( wxCurrentPopupWindow == this )
+            wxCurrentPopupWindow = NULL;
+    }
 
     if ( HasFlag(wxPU_CONTAINS_CONTROLS) )
     {
@@ -170,6 +192,24 @@ void wxPopupTransientWindow::Dismiss()
     Hide();
 }
 
+void wxPopupTransientWindow::DismissOnDeactivate()
+{
+    // Hide the window automatically when it loses activation.
+    Dismiss();
+
+    // Activation might have gone to a different window or maybe
+    // even a different application, don't let our owner continue
+    // to appear active in this case.
+    wxWindow* const owner = MSWGetOwner();
+    if ( owner )
+    {
+        if ( ::GetActiveWindow() != GetHwndOf(owner) )
+        {
+            ::SendMessage(GetHwndOf(owner), WM_NCACTIVATE, FALSE, 0);
+        }
+    }
+}
+
 bool
 wxPopupTransientWindow::MSWHandleMessage(WXLRESULT *result,
                                          WXUINT message,
@@ -178,24 +218,17 @@ wxPopupTransientWindow::MSWHandleMessage(WXLRESULT *result,
 {
     switch ( message )
     {
-        case WM_NCACTIVATE:
-            if ( !wParam )
+        case WM_ACTIVATE:
+            if ( wParam == WA_INACTIVE )
             {
-                // Hide the window automatically when it loses activation.
-                Dismiss();
-
-                // Activation might have gone to a different window or maybe
-                // even a different application, don't let our owner continue
-                // to appear active in this case.
-                wxWindow* const owner = MSWGetOwner();
-                if ( owner )
-                {
-                    const HWND hwndActive = ::GetActiveWindow();
-                    if ( hwndActive != GetHwndOf(owner) )
-                    {
-                        ::SendMessage(GetHwndOf(owner), WM_NCACTIVATE, FALSE, 0);
-                    }
-                }
+                // We need to dismiss this window, however doing it directly
+                // from here seems to confuse ::ShowWindow(), which ends up
+                // calling this handler, and may result in losing activation
+                // entirely, so postpone it slightly.
+                //
+                // Also note that the active window hasn't changed yet, so we
+                // postpone calling it until DismissOnDeactivate() is executed.
+                CallAfter(&wxPopupTransientWindow::DismissOnDeactivate);
             }
             break;
     }
diff --git a/src/msw/power.cpp b/src/msw/power.cpp
index 92ff808675..e17122e224 100644
--- a/src/msw/power.cpp
+++ b/src/msw/power.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 53de22d010..5074092790 100644
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -796,24 +796,6 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
 
-    pd->lStructSize    = sizeof(PRINTDLG);
-    pd->hwndOwner      = NULL;
-    pd->hDevMode       = NULL; // Will be created by PrintDlg
-    pd->hDevNames      = NULL; // Ditto
-
-    pd->Flags          = PD_RETURNDEFAULT;
-    pd->nCopies        = 1;
-
-    // Pass the devmode data to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-    if (pd->hDevMode)
-        GlobalFree(pd->hDevMode);
-
-    // Pass the devnames data to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-    if (pd->hDevNames)
-        GlobalFree(pd->hDevNames);
-
     pd->hDevMode = static_cast<HGLOBAL>(native_data->GetDevMode());
     native_data->SetDevMode(NULL);
 
diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index 00c3fa93b4..84a16ddbfa 100644
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -103,24 +103,15 @@ void wxRadioButton::SetValue(bool value)
     // reselected automatically, if a parent window loses the focus and regains
     // it.
     wxWindow * const focus = FindFocus();
-    wxTopLevelWindow * const
-        tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    wxCHECK_RET( tlw, wxT("radio button outside of TLW?") );
-    wxWindow * const focusInTLW = tlw->GetLastFocus();
 
     const wxWindowList& siblings = GetParent()->GetChildren();
     wxWindowList::compatibility_iterator nodeThis = siblings.Find(this);
     wxCHECK_RET( nodeThis, wxT("radio button not a child of its parent?") );
 
-    // this will be set to true in the code below if the focus is in our TLW
-    // and belongs to one of the other buttons in the same group
+    // this will be set to true in the code below if the focus belongs to one
+    // of the other buttons in the same group
     bool shouldSetFocus = false;
 
-    // this will be set to true if the focus is outside of our TLW currently
-    // but the remembered focus of this TLW is one of the other buttons in the
-    // same group
-    bool shouldSetTLWFocus = false;
-
     // if it's not the first item of the group ...
     if ( !HasFlag(wxRB_GROUP) )
     {
@@ -146,8 +137,6 @@ void wxRadioButton::SetValue(bool value)
 
             if ( btn == focus )
                 shouldSetFocus = true;
-            else if ( btn == focusInTLW )
-                shouldSetTLWFocus = true;
 
             btn->SetValue(false);
 
@@ -179,16 +168,25 @@ void wxRadioButton::SetValue(bool value)
 
         if ( btn == focus )
             shouldSetFocus = true;
-        else if ( btn == focusInTLW )
-            shouldSetTLWFocus = true;
 
         btn->SetValue(false);
     }
 
     if ( shouldSetFocus )
+    {
+        // Change focus immediately, we can't do anything else in this case as
+        // leaving it to the other radio button would put it in an impossible
+        // state: a radio button can't have focus and be unchecked.
         SetFocus();
-    else if ( shouldSetTLWFocus )
-        tlw->SetLastFocus(this);
+    }
+    else
+    {
+        // Don't change focus right now, this could be unexpected, but do
+        // ensure that when our parent regains focus, it goes to this button
+        // and not another one, which would result in this one losing its
+        // checked status.
+        GetParent()->WXSetPendingFocus(this);
+    }
 }
 
 bool wxRadioButton::GetValue() const
diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index b7e18d85fd..8766364efe 100644
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -359,6 +359,9 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
 
 wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri)
 {
+    if (this == &ri)
+        return *this;
+
     delete [] m_rects;
 
     m_current = ri.m_current;
diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 6d529a1946..b7bd070f5e 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -857,21 +857,18 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
 {
     wxUxThemeHandle hTheme(win, L"TASKDIALOG");
 
-    int state;
-    if (flags & wxCONTROL_PRESSED)
-        state = TDLGEBS_PRESSED;
-    else if (flags & wxCONTROL_CURRENT)
-        state = TDLGEBS_HOVER;
-    else
-        state = TDLGEBS_NORMAL;
-
-    if ( flags & wxCONTROL_EXPANDED )
-        state += 3;
-
     if ( ::IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) )
     {
-        if (flags & wxCONTROL_EXPANDED)
-            flags |= wxCONTROL_CHECKED;
+        int state;
+        if (flags & wxCONTROL_PRESSED)
+            state = TDLGEBS_PRESSED;
+        else if (flags & wxCONTROL_CURRENT)
+            state = TDLGEBS_HOVER;
+        else
+            state = TDLGEBS_NORMAL;
+
+        if ( flags & wxCONTROL_EXPANDED )
+            state += 3;
 
         RECT r = ConvertToRECT(dc, rect);
 
diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 4b8534f18b..3377b5b080 100644
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -253,7 +253,10 @@ static const int gs_metricsMap[] =
     SM_PENWINDOWS,
     SM_SHOWSOUNDS,
     SM_SWAPBUTTON,
-    -1   // wxSYS_DCLICK_MSEC - not available as system metric
+    -1,   // wxSYS_DCLICK_MSEC - not available as system metric
+    -1,   // wxSYS_CARET_ON_MSEC - not available as system metric
+    -1,   // wxSYS_CARET_OFF_MSEC - not available as system metric
+    -1    // wxSYS_CARET_TIMEOUT_MSEC - not available as system metric
 };
 
 // Get a system metric, e.g. scrollbar size
@@ -268,6 +271,25 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         return ::GetDoubleClickTime();
     }
 
+    // return the caret blink time for both
+    // wxSYS_CARET_ON_MSEC and wxSYS_CARET_OFF_MSEC
+    if ( index == wxSYS_CARET_ON_MSEC || index == wxSYS_CARET_OFF_MSEC )
+    {
+        const UINT blinkTime = ::GetCaretBlinkTime();
+
+        if ( blinkTime == 0 ) // error
+        {
+            return -1;
+        }
+        
+        if ( blinkTime == INFINITE ) // caret does not blink
+        {
+            return 0;
+        }
+
+        return blinkTime;
+    }
+
     int indexMSW = gs_metricsMap[index];
     if ( indexMSW == -1 )
     {
diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp
index 2a66c8eda4..4dbd6a6b4e 100644
--- a/src/msw/sockmsw.cpp
+++ b/src/msw/sockmsw.cpp
@@ -310,7 +310,7 @@ void wxSocketImplMSW::DoClose()
 {
     wxSocketManager::Get()->Uninstall_Callback(this);
 
-    closesocket(m_fd);
+    wxCloseSocket(m_fd);
 }
 
 wxSocketError wxSocketImplMSW::GetLastError() const
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 058e08ed3d..1835296b47 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -734,21 +734,14 @@ wxSize wxSpinCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
 {
     wxSize sizeBtn = wxSpinButton::DoGetBestSize();
 
-    int y;
-    wxGetCharSize(GetHWND(), NULL, &y, GetFont());
-    // JACS: we should always use the height calculated
-    // from above, because otherwise we'll get a spin control
-    // that's too big. So never use the height calculated
-    // from wxSpinButton::DoGetBestSize().
+    // Create a temporary wxTextCtrl wrapping our existing HWND in order to be
+    // able to reuse its GetSizeFromTextSize() implementation.
+    wxTextCtrl text;
+    TempHWNDSetter set(&text, m_hwndBuddy);
 
-    wxSize tsize(xlen + sizeBtn.x - GetOverlap(),
-                 EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
-
-    // Check if the user requested a non-standard height.
-    if ( ylen > 0 )
-        tsize.IncBy(0, ylen - y);
-
-    return tsize;
+    // Increase the width to accommodate the button, which should fit inside
+    // the text control while taking account of the overlap.
+    return text.GetSizeFromTextSize(xlen + sizeBtn.x - GetOverlap(), ylen);
 }
 
 void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index 61f3e1f77b..61f7aa4a60 100644
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Artur Bac 2010-10-01 AMD64 Port
 // Created:     2005-01-08
-// Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index c574663f6c..46b7ee876c 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -104,9 +104,12 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // we may have either bitmap or icon: if a bitmap with mask is passed, we
     // will transform it to an icon ourselves because otherwise the mask will
     // be ignored by Windows
-    m_isIcon = bitmap.IsKindOf(wxCLASSINFO(wxIcon));
-
     wxGDIImage *image = ConvertImage( bitmap );
+
+    // Note that m_isIcon must be set before calling MSWCreateControl() so that
+    // it creates the control with the correct style, as returned by
+    // MSWGetStyle(), which uses m_isIcon to determine whether to use SS_ICON
+    // or SS_BITMAP.
     m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
 
     // create the native control
@@ -278,8 +281,20 @@ void wxStaticBitmap::MSWReplaceImageHandle(WXLPARAM handle)
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 {
+    wxSize sizeOld;
+    if ( m_image )
+        sizeOld = m_image->GetSize();
+
+    wxSize sizeNew;
+    if ( image )
+        sizeNew = image->GetSize();
+
+    const bool wasIcon = m_isIcon;
+
     Free();
-    InvalidateBestSize();
+
+    if ( sizeNew != sizeOld )
+        InvalidateBestSize();
 
     m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
     // the image has already been copied
@@ -313,28 +328,25 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
         }
     }
 #endif // wxUSE_WXDIB
-    wxMSWWinStyleUpdater(GetHwnd())
-        .TurnOff(SS_BITMAP | SS_ICON)
-        .TurnOn(m_isIcon ? SS_ICON : SS_BITMAP);
+
+    if ( m_isIcon != wasIcon )
+    {
+        wxMSWWinStyleUpdater(GetHwnd())
+            .TurnOff(SS_BITMAP | SS_ICON)
+            .TurnOn(m_isIcon ? SS_ICON : SS_BITMAP);
+    }
 
     MSWReplaceImageHandle((WXLPARAM)handle);
 
-    DeleteCurrentHandleIfNeeded();
-
     m_currentHandle = (WXHANDLE)handle;
     m_ownsCurrentHandle = handle != handleOrig;
 
-    if ( ImageIsOk() )
+    if ( sizeNew != sizeOld )
     {
-        int width = image->GetWidth(),
-            height = image->GetHeight();
-        if ( width && height )
-        {
-            w = width;
-            h = height;
+        w += sizeNew.x - sizeOld.x;
+        h += sizeNew.y - sizeOld.y;
 
-            MSWMoveWindowToAnyPosition(GetHwnd(), x, y, width, height, false);
-        }
+        MSWMoveWindowToAnyPosition(GetHwnd(), x, y, w, h, false);
     }
 
     RECT rect;
diff --git a/src/msw/stdpaths.cpp b/src/msw/stdpaths.cpp
index 019744d574..52f7fadb5d 100644
--- a/src/msw/stdpaths.cpp
+++ b/src/msw/stdpaths.cpp
@@ -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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/systhemectrl.cpp b/src/msw/systhemectrl.cpp
index 8634368514..03c13271fb 100644
--- a/src/msw/systhemectrl.cpp
+++ b/src/msw/systhemectrl.cpp
@@ -24,8 +24,15 @@ void wxSystemThemedControlBase::DoEnableSystemTheme(bool enable, wxWindow* windo
 {
     if ( wxGetWinVersion() >= wxWinVersion_Vista && wxUxThemeIsActive() )
     {
-         const wchar_t* const sysThemeId = enable ? L"EXPLORER" : NULL;
-         ::SetWindowTheme(GetHwndOf(window), sysThemeId, NULL);
+        // It's possible to call EnableSystemTheme(false) before creating the
+        // window, just don't do anything in this case.
+        if ( window->GetHandle() )
+        {
+            const wchar_t* const sysThemeId = enable ? L"EXPLORER" : NULL;
+            ::SetWindowTheme(GetHwndOf(window), sysThemeId, NULL);
+        }
+
+        m_systemThemeDisabled = !enable;
     }
 }
 
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 52637d901c..fed5741b58 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2080,7 +2080,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             {
                 if ( ::GetFocus() == GetHwnd() )
                 {
-                    int flags = 0;
+                    int flags = wxNavigationKeyEvent::FromTab;
                     if (!event.ShiftDown())
                         flags |= wxNavigationKeyEvent::IsForward ;
                     if (event.ControlDown())
diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index ba2c901848..49c7601ddd 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxTextEntry implementation for wxMSW
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/timectrl.cpp b/src/msw/timectrl.cpp
index e02af0d273..9e31da91cc 100644
--- a/src/msw/timectrl.cpp
+++ b/src/msw/timectrl.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxTimePickerCtrl implementation
 // Author:      Vadim Zeitlin
 // Created:     2005-01-09
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index 2c4ae26eb1..456ab0424e 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -94,6 +94,9 @@
     #define TB_GETMAXSIZE           (WM_USER + 83)
 #endif
 
+// Margin between the control and its label.
+static const int MARGIN_CONTROL_LABEL = 3;
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -162,17 +165,7 @@ public:
         if ( IsControl() && !m_label.empty() )
         {
             // Create a control to render the control's label.
-            // It has the same witdh as the control.
-            wxSize size(control->GetSize().GetWidth(), wxDefaultCoord);
-            m_staticText = new wxStaticText
-                               (
-                                 m_tbar,
-                                 wxID_ANY,
-                                 m_label,
-                                 wxDefaultPosition,
-                                 size,
-                                 wxALIGN_CENTRE | wxST_NO_AUTORESIZE
-                               );
+            m_staticText = new wxStaticText(m_tbar, wxID_ANY, m_label);
         }
         else // no label
         {
@@ -201,39 +194,32 @@ public:
         {
             if ( m_staticText )
             {
-                 if ( !label.empty() )
-                 {
+                if ( !label.empty() )
+                {
                     m_staticText->SetLabel(label);
-                 }
-                 else
-                 {
+                }
+                else
+                {
                     delete m_staticText;
                     m_staticText = NULL;
-                 }
+                }
             }
             else
             {
-                 if ( !label.empty() )
-                 {
-                    // Create a control to render the control's label.
-                    // It has the same witdh as the control.
-                    wxSize size(m_control->GetSize().GetWidth(), wxDefaultCoord);
-                    m_staticText = new wxStaticText(m_tbar, wxID_ANY, label,
-                                        wxDefaultPosition, size,
-                                        wxALIGN_CENTRE | wxST_NO_AUTORESIZE);
-                 }
+                if ( !label.empty() )
+                {
+                    m_staticText = new wxStaticText(m_tbar, wxID_ANY, label);
+                }
             }
         }
-        else if ( IsButton() )
-        {
-            // Because new label can have different length than the old one
-            // so updating button's label with TB_SETBUTTONINFO would require
-            // also manual re-positionining items in the control tools located
-            // to the right in the toolbar and recalculation of stretchable
-            // spacers so it is easier just to recreate the toolbar with
-            // Realize(). Performance penalty should be negligible.
-            m_tbar->Realize();
-        }
+
+        // Because new label can have different length than the old one
+        // so updating button's label with TB_SETBUTTONINFO would require
+        // also manual re-positionining items in the control tools located
+        // to the right in the toolbar and recalculation of stretchable
+        // spacers so it is easier just to recreate the toolbar with
+        // Realize(). Performance penalty should be negligible.
+        m_tbar->Realize();
     }
 
     wxStaticText* GetStaticText()
@@ -475,6 +461,22 @@ void wxToolBar::Recreate()
     const wxPoint pos = GetPosition();
     const wxSize size = GetSize();
 
+    // Note that MSWCreateToolbar() will set the current size as the initial
+    // and minimal size of the toolbar, which is unwanted both because it loses
+    // any actual min size set from user code and because even if SetMinSize()
+    // is never called, we're going to be stuck with the bigger than necessary
+    // min size when we're switching from text+icons to text or icons-only
+    // modes, so preserve the current min size here.
+    const wxSize minSizeOrig = GetMinSize();
+
+    // Hide the toolbar before recreating it to ensure that wxFrame doesn't try
+    // to account for its size, e.g. to offset the position of the new toolbar
+    // being created by the size of this toolbar itself. This wouldn't work
+    // anyhow, because we can't query for the size of a window without any
+    // valid HWND, but would result in debug warning messages and is just a
+    // wrong thing to do anyhow.
+    Hide();
+
     UnsubclassWin();
 
     if ( !MSWCreateToolbar(pos, size) )
@@ -485,6 +487,11 @@ void wxToolBar::Recreate()
         return;
     }
 
+    SetMinSize(minSizeOrig);
+
+    // Undo the effect of Hide() above.
+    Show();
+
     // reparent all our children under the new toolbar
     for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
           node;
@@ -508,6 +515,11 @@ void wxToolBar::Recreate()
 
     wxDELETE(m_disabledImgList);
 
+    // Also skip deleting the existing buttons in Realize(): they don't exist
+    // any more, so doing this is unnecessary and just results in errors from
+    // TB_DELETEBUTTON.
+    m_nButtons = 0;
+
     Realize();
 }
 
@@ -527,68 +539,107 @@ wxToolBar::~wxToolBar()
     delete m_disabledImgList;
 }
 
+wxSize wxToolBar::MSWGetFittingtSizeForControl(wxToolBarTool* tool) const
+{
+    // Note that we intentionally use GetSize() and not GetBestSize() here as
+    // the control could have been added to the toolbar with the size less than
+    // its best size in order to avoid taking too much space.
+    wxSize size = tool->GetControl()->GetSize();
+
+    // This is arbitrary, but we want to leave at least 1px around the control
+    // vertically, otherwise it really looks too cramped.
+    size.y += 2*1;
+
+    // Account for the label, if any.
+    if ( wxStaticText * const staticText = tool->GetStaticText() )
+    {
+        if ( AreControlLabelsShown() )
+        {
+            const wxSize sizeLabel = staticText->GetSize();
+
+            if ( size.x < sizeLabel.x )
+                size.x = sizeLabel.x;
+
+            size.y += sizeLabel.y;
+            size.y += MARGIN_CONTROL_LABEL;
+        }
+    }
+
+    // Also account for the tool padding value: note that we only have to add
+    // half of it to each tool, as the total amount of packing is the sum of
+    // the right margin of the previous tool and the left margin of the next
+    // one.
+    size.x += m_toolPacking / 2;
+
+    return size;
+}
+
 wxSize wxToolBar::DoGetBestSize() const
 {
+    const wxSize sizeTool = GetToolSize();
+
     wxSize sizeBest;
-
-    SIZE size;
-    if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
+    if ( IsVertical() )
     {
-        // maybe an old (< 0x400) Windows version? try to approximate the
-        // toolbar size ourselves
-        sizeBest = GetToolSize();
-        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
-        sizeBest.x *= GetToolsCount();
+        sizeBest.x = sizeTool.x + 2 * ::GetSystemMetrics(SM_CXBORDER);
+    }
+    else
+    {
+        sizeBest.y = sizeTool.y + 2 * ::GetSystemMetrics(SM_CYBORDER);
+    }
+
+    wxToolBarToolsList::compatibility_iterator node;
+    int toolIndex = 0;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarTool * const
+            tool = static_cast<wxToolBarTool *>(node->GetData());
+
+        // Note that we can't just reuse sizeTool here, even though all normal
+        // items do have this size, this is not true for the separators and it
+        // is both more robust and simpler to just always use TB_GETITEMRECT
+        // rather than handling the separators specially.
+        const RECT rcItem = wxGetTBItemRect(GetHwnd(), toolIndex++);
 
-        // reverse horz and vertical components if necessary
         if ( IsVertical() )
         {
-            wxSwap(sizeBest.x, sizeBest.y);
-        }
-    }
-    else // TB_GETMAXSIZE succeeded
-    {
-        // but it could still return an incorrect result due to what appears to
-        // be a bug in old comctl32.dll versions which don't handle controls in
-        // the toolbar correctly, so work around it (see SF patch 1902358)
-        if ( !IsVertical() && wxApp::GetComCtl32Version() < 600 )
-        {
-            // calculate the toolbar width in alternative way
-            const RECT rcFirst = wxGetTBItemRect(GetHwnd(), 0);
-            const RECT rcLast = wxGetTBItemRect(GetHwnd(), GetToolsCount() - 1);
-
-            const int widthAlt = rcLast.right - rcFirst.left;
-            if ( widthAlt > size.cx )
-                size.cx = widthAlt;
-        }
-
-        sizeBest.x = size.cx;
-        sizeBest.y = size.cy;
-    }
-
-    if ( !IsVertical() )
-    {
-        wxToolBarToolsList::compatibility_iterator node;
-        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-        {
-            wxToolBarTool * const
-                tool = static_cast<wxToolBarTool *>(node->GetData());
-            if (tool->IsControl())
+            if ( !tool->IsControl() )
             {
-                int y = tool->GetControl()->GetSize().y;
-                // Approximate border size
-                if (y > (sizeBest.y - 4))
-                    sizeBest.y = y + 4;
+                sizeBest.y += rcItem.bottom - rcItem.top;
+            }
+            //else: Controls are not shown in vertical toolbars at all.
+        }
+        else
+        {
+            if ( tool->IsControl() )
+            {
+                const wxSize sizeControl = MSWGetFittingtSizeForControl(tool);
+
+                // Ensure we're tall enough for the embedded controls.
+                sizeBest.IncTo(wxSize(-1, sizeControl.y));
+
+                sizeBest.x += sizeControl.x;
+            }
+            else
+            {
+                sizeBest.x += rcItem.right - rcItem.left;
             }
         }
+    }
 
-        // Without the extra height, DoGetBestSize can report a size that's
-        // smaller than the actual window, causing windows to overlap slightly
-        // in some circumstances, leading to missing borders (especially noticeable
-        // in AUI layouts).
-        if (!(GetWindowStyle() & wxTB_NODIVIDER))
-            sizeBest.y += 2;
-        sizeBest.y ++;
+    // Note that this needs to be done after the loop to account for controls
+    // too high to fit into the toolbar without the border size but that could
+    // fit if we had added the border beforehand.
+    if ( !HasFlag(wxTB_NODIVIDER) )
+    {
+        if ( IsVertical() )
+        {
+            sizeBest.x += 2 * ::GetSystemMetrics(SM_CXBORDER);
+        }
+        else
+        {
+            sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER);
+        }
     }
 
     return sizeBest;
@@ -735,6 +786,8 @@ bool wxToolBar::Realize()
     if ( !wxToolBarBase::Realize() )
         return false;
 
+    InvalidateBestSize();
+
     const size_t nTools = GetToolsCount();
 
     // don't change the values of these constants, they can be set from the
@@ -1045,21 +1098,9 @@ bool wxToolBar::Realize()
         switch ( tool->GetStyle() )
         {
             case wxTOOL_STYLE_CONTROL:
-                if ( wxStaticText *staticText = tool->GetStaticText() )
+                if ( !IsVertical() )
                 {
-                    // Display control and its label only if buttons have icons
-                    // and texts as otherwise there is not enough room on the
-                    // toolbar to fit the label.
-                    staticText->
-                        Show(HasFlag(wxTB_TEXT) && !HasFlag(wxTB_NOICONS));
-                }
-
-                // Set separator width/height to fit the control width/height
-                // taking into account tool padding value.
-                // (height is not used but it is set for the sake of consistency).
-                {
-                    const wxSize sizeControl = tool->GetControl()->GetSize();
-                    button.iBitmap = m_toolPacking + (IsVertical() ? sizeControl.y : sizeControl.x);
+                    button.iBitmap = MSWGetFittingtSizeForControl(tool).x;
                 }
 
                 wxFALLTHROUGH;
@@ -1175,6 +1216,15 @@ bool wxToolBar::Realize()
                 break;
         }
 
+        if ( IsVertical() )
+        {
+            // MSDN says that TBSTATE_WRAP should be used for all buttons in
+            // vertical toolbars, so do it even if it doesn't seem to actually
+            // change anything in practice (including the problem with
+            // TB_AUTOSIZE mentioned in UpdateSize()).
+            button.fsState |= TBSTATE_WRAP;
+        }
+
         lastWasRadio = isRadio;
 
         i++;
@@ -1189,6 +1239,17 @@ bool wxToolBar::Realize()
     // Adjust controls and stretchable spaces
     // --------------------------------------
 
+    // We don't trust the height returned by wxGetTBItemRect() as it may not
+    // have been updated yet, use the height that the toolbar will actually
+    // have instead.
+    int height = GetBestSize().y;
+    if ( !HasFlag(wxTB_NODIVIDER) )
+    {
+        // We want just the usable height, so remove the space taken by the
+        // border/divider.
+        height -= 2 * ::GetSystemMetrics(SM_CYBORDER);
+    }
+
     // adjust the controls size to fit nicely in the toolbar and compute its
     // total size while doing it
     m_totalFixedSize = 0;
@@ -1201,10 +1262,15 @@ bool wxToolBar::Realize()
 
         if ( !tool->IsControl() )
         {
-            if ( IsVertical() )
-                m_totalFixedSize += r.bottom - r.top;
-            else
-                m_totalFixedSize += r.right - r.left;
+            // Stretchable space don't have any fixed size and their current
+            // size shouldn't count at all.
+            if ( !tool->IsStretchableSpace() )
+            {
+                if ( IsVertical() )
+                    m_totalFixedSize += r.bottom - r.top;
+                else
+                    m_totalFixedSize += r.right - r.left;
+            }
 
             continue;
         }
@@ -1216,57 +1282,52 @@ bool wxToolBar::Realize()
             // good and wxGTK doesn't do it neither (and the code below can't
             // deal with this case)
             control->Hide();
+            if ( wxStaticText * const staticText = tool->GetStaticText() )
+                staticText->Hide();
             continue;
         }
 
         control->Show();
-        wxStaticText * const staticText = tool->GetStaticText();
 
-        wxSize size = control->GetSize();
-        wxSize staticTextSize;
-        if ( staticText && staticText->IsShown() )
+        const wxSize controlSize = control->GetSize();
+
+        // Take also into account tool padding value: the amount of padding
+        // used for each tool is half of m_toolPacking, so the margin on each
+        // side is a half of that.
+        const int x = r.left + m_toolPacking / 4;
+
+        // Greater of control and its label widths.
+        int totalWidth = controlSize.x;
+
+        // Height of control and its label, if any, including the margin
+        // between them.
+        int totalHeight = controlSize.y;
+
+        if ( wxStaticText * const staticText = tool->GetStaticText() )
         {
-            staticTextSize = staticText->GetSize();
-            staticTextSize.y += 3; // margin between control and its label
-        }
+            const bool shown = AreControlLabelsShown();
+            staticText->Show(shown);
 
-        // position the control itself correctly vertically centering it on the
-        // icon area of the toolbar
-        int height = r.bottom - r.top - staticTextSize.y;
-
-        int diff = height - size.y;
-        if ( diff < 0 || !HasFlag(wxTB_TEXT) )
-        {
-            // not enough room for the static text
-            if ( staticText )
-                staticText->Hide();
-
-            // recalculate height & diff without the staticText control
-            height = r.bottom - r.top;
-            diff = height - size.y;
-            if ( diff < 0 )
+            if ( shown )
             {
-                // the control is too high, resize to fit
-                // Actually don't set the size, otherwise we can never fit
-                // the toolbar around the controls.
-                // control->SetSize(wxDefaultCoord, height - 2);
+                const wxSize staticTextSize = staticText->GetSize();
 
-                diff = 2;
+                if ( staticTextSize.x > totalWidth )
+                    totalWidth = staticTextSize.x;
+
+                // Center the static text horizontally for consistency with the
+                // button labels and position it below the control vertically.
+                staticText->Move(x + (totalWidth - staticTextSize.x)/2,
+                                 r.top + (height + controlSize.y
+                                                 - staticTextSize.y
+                                                 + MARGIN_CONTROL_LABEL)/2);
+
+                totalHeight += staticTextSize.y + MARGIN_CONTROL_LABEL;
             }
         }
-        else // enough space for both the control and the label
-        {
-            if ( staticText )
-                staticText->Show();
-        }
 
-        // Take also into account tool padding value.
-        control->Move(r.left + m_toolPacking/2, r.top + (diff + 1) / 2);
-        if ( staticText )
-        {
-            staticText->Move(r.left + m_toolPacking/2 + (size.x - staticTextSize.x)/2,
-                             r.bottom - staticTextSize.y);
-        }
+        control->Move(x + (totalWidth - controlSize.x)/2,
+                      r.top + (height - totalHeight)/2);
 
         m_totalFixedSize += r.right - r.left;
     }
@@ -1278,8 +1339,16 @@ bool wxToolBar::Realize()
     if ( !IsVertical() )
     {
         if ( m_maxRows == 0 )
+        {
             // if not set yet, only one row
             SetRows(1);
+        }
+        else
+        {
+            // In all the other cases, UpdateSize() is called by SetRows(), but
+            // when we don't call it here, call it directly instead.
+            UpdateSize();
+        }
     }
     else if ( m_nButtons > 0 ) // vertical non empty toolbar
     {
@@ -1288,32 +1357,6 @@ bool wxToolBar::Realize()
         SetRows(m_nButtons);
     }
 
-    InvalidateBestSize();
-    UpdateSize();
-
-    if ( IsVertical() )
-    {
-        // For vertical toolbar heights of buttons are incorrect
-        // unless TB_AUTOSIZE in invoked.
-        // We need to recalculate fixed elements size again.
-        m_totalFixedSize = 0;
-        toolIndex = 0;
-        for ( node = m_tools.GetFirst(); node; node = node->GetNext(), toolIndex++ )
-        {
-            wxToolBarTool * const tool = (wxToolBarTool*)node->GetData();
-            if ( !tool->IsStretchableSpace() )
-            {
-                const RECT r = wxGetTBItemRect(GetHwnd(), toolIndex);
-                if ( !IsVertical() )
-                    m_totalFixedSize += r.right - r.left;
-                else if ( !tool->IsControl() )
-                    m_totalFixedSize += r.bottom - r.top;
-            }
-        }
-        // Enforce invoking UpdateStretchableSpacersSize() with correct value of fixed elements size.
-        UpdateSize();
-    }
-
     return true;
 }
 
@@ -1388,31 +1431,20 @@ void wxToolBar::UpdateStretchableSpacersSize()
         const int newSize = --numSpaces ? sizeSpacer : sizeLastSpacer;
         if ( newSize != oldSize)
         {
-            if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, toolIndex, 0) )
+            WinStruct<TBBUTTONINFO> tbbi;
+            tbbi.dwMask = TBIF_BYINDEX | TBIF_SIZE;
+            tbbi.cx = newSize;
+            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+                                toolIndex, (LPARAM)&tbbi) )
             {
-                wxLogLastError(wxT("TB_DELETEBUTTON (separator)"));
+                wxLogLastError(wxT("TB_SETBUTTONINFO (separator)"));
             }
             else
             {
-                TBBUTTON button;
-                wxZeroMemory(button);
-
-                button.idCommand = tool->GetId();
-                button.iBitmap = newSize; // set separator width/height
-                button.fsState = TBSTATE_ENABLED;
-                button.fsStyle = TBSTYLE_SEP;
-                if ( IsVertical() )
-                    button.fsState |= TBSTATE_WRAP;
-                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON, toolIndex, (LPARAM)&button) )
-                {
-                    wxLogLastError(wxT("TB_INSERTBUTTON (separator)"));
-                }
-                else
-                {
-                    // We successfully replaced this seprator, move all the controls after it
-                    // by the corresponding amount (may be positive or negative)
-                    offset += newSize - oldSize;
-                }
+                // We successfully updated the separator width, move all the
+                // controls appearing after it by the corresponding amount
+                // (which may be positive or negative)
+                offset += newSize - oldSize;
             }
         }
 
@@ -1588,12 +1620,6 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
-    // Leave the effective size as (0, 0) if we are not showing bitmaps at all.
-    wxSize effectiveSize;
-
-    if ( !HasFlag(wxTB_NOICONS) )
-        effectiveSize = size;
-
     wxToolBarBase::SetToolBitmapSize(size);
 
     ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
@@ -1622,14 +1648,25 @@ void wxToolBar::SetRows(int nRows)
     const bool enable = (!IsVertical() && m_maxRows == 1) ||
                            (IsVertical() && (size_t)m_maxRows == m_nButtons);
 
-    const LPARAM state = MAKELONG(enable ? TBSTATE_ENABLED : TBSTATE_HIDDEN, 0);
+    LPARAM state = enable ? TBSTATE_ENABLED : TBSTATE_HIDDEN;
+
+    if ( IsVertical() )
+    {
+        // As in Realize(), ensure that TBSTATE_WRAP is used for all the
+        // tools, including separators, in vertical toolbar, and here it does
+        // make a difference: without it, the following tools wouldn't be
+        // visible because they would be on the same row as the separator.
+        state |= TBSTATE_WRAP;
+    }
+
     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarTool * const tool = (wxToolBarTool*)node->GetData();
         if ( tool->IsStretchableSpace() )
         {
-            if ( !::SendMessage(GetHwnd(), TB_SETSTATE, tool->GetId(), state) )
+            if ( !::SendMessage(GetHwnd(), TB_SETSTATE,
+                                tool->GetId(), MAKELONG(state, 0)) )
             {
                 wxLogLastError(wxT("TB_SETSTATE (stretchable spacer)"));
             }
@@ -1665,10 +1702,13 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 
 void wxToolBar::UpdateSize()
 {
-    wxPoint pos = GetPosition();
-    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
-    if (pos != GetPosition())
-        Move(pos);
+    // We used to use TB_AUTOSIZE here, but it didn't work at all for vertical
+    // toolbars and was more trouble than it was worth for horizontal one as it
+    // added some unwanted margins that we had to remove later. So now we just
+    // compute our own size and use it.
+    SetSize(GetBestSize());
+
+    UpdateStretchableSpacersSize();
 
     // In case Realize is called after the initial display (IOW the programmer
     // may have rebuilt the toolbar) give the frame the option of resizing the
@@ -1851,116 +1891,12 @@ void wxToolBar::OnEraseBackground(wxEraseEvent& event)
 #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
 }
 
-bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
 {
     // wait until we have some tools
-    const int toolsCount = GetToolsCount();
-    if ( toolsCount == 0 )
+    if ( !GetToolsCount() )
         return false;
 
-    // calculate our minor dimension ourselves - we're confusing the standard
-    // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
-    // Find bounding box for all rows.
-    RECT r;
-    ::SetRectEmpty(&r);
-    // Bounding box for single (current) row
-    RECT rcRow;
-    ::SetRectEmpty(&rcRow);
-    int rowPosX = INT_MIN;
-    wxToolBarToolsList::compatibility_iterator node;
-    int i = 0;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarTool * const
-            tool = static_cast<wxToolBarTool *>(node->GetData());
-        if ( tool->IsToBeDeleted() )
-            continue;
-
-        // Skip hidden buttons
-        const RECT rcItem = wxGetTBItemRect(GetHwnd(), i);
-        if ( ::IsRectEmpty(&rcItem) )
-        {
-            i++;
-            continue;
-        }
-
-        if ( rcItem.top > rowPosX )
-        {
-            // We have the next row.
-            rowPosX = rcItem.top;
-
-            // Shift origin to (0, 0) to make it the same as for the total rect.
-            ::OffsetRect(&rcRow, -rcRow.left, -rcRow.top);
-
-            // And update the bounding box for all rows.
-            ::UnionRect(&r, &r, &rcRow);
-
-            // Reset the current row bounding box for the next row.
-            ::SetRectEmpty(&rcRow);
-        }
-
-        // Separators shouldn't be taken into account as they are sometimes
-        // reported to have the width of the entire client area by the toolbar.
-        // And we know that they are not the biggest items in the toolbar in
-        // any case, so just skip them.
-        if( !tool->IsSeparator() )
-        {
-            // Update bounding box of current row
-            ::UnionRect(&rcRow, &rcRow, &rcItem);
-        }
-
-        i++;
-    }
-
-    // Take into account the last row rectangle too.
-    ::OffsetRect(&rcRow, -rcRow.left, -rcRow.top);
-    ::UnionRect(&r, &r, &rcRow);
-
-    if ( !r.right )
-        return false;
-
-    int w, h;
-
-    if ( IsVertical() )
-    {
-        w = r.right - r.left;
-        h = HIWORD(lParam);
-    }
-    else
-    {
-        w = LOWORD(lParam);
-        if (HasFlag( wxTB_FLAT ))
-            h = r.bottom - r.top - 3;
-        else
-            h = r.bottom - r.top;
-
-        // Take control height into account
-        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-        {
-            wxToolBarTool * const
-                tool = static_cast<wxToolBarTool *>(node->GetData());
-            if (tool->IsControl())
-            {
-                int y = (tool->GetControl()->GetSize().y - 2); // -2 since otherwise control height + 4 (below) is too much
-                if (y > h)
-                    h = y;
-            }
-        }
-
-        if ( m_maxRows )
-        {
-            // FIXME: hardcoded separator line height...
-            h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
-            h *= m_maxRows;
-        }
-    }
-
-    if ( MAKELPARAM(w, h) != lParam )
-    {
-        // size really changed
-        SetSize(w, h);
-    }
-
     UpdateStretchableSpacersSize();
 
     // message processed
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index e9f9defff4..8e1025ab24 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -790,7 +790,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     {
         // The Vista+ system theme uses rotating ("twist") buttons, so we map
         // this style to it.
-        EnableSystemTheme();
+        EnableSystemThemeByDefault();
     }
 
     return true;
diff --git a/src/msw/version.rc b/src/msw/version.rc
index f1ddd9dbcc..d6cd4203d9 100644
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -92,7 +92,7 @@ BEGIN
             VALUE "FileDescription", "wxWidgets " WXLIBDESC " library\0"
             VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "InternalName", wxSTRINGIZE(WXDLLNAME) "\0"
-            VALUE "LegalCopyright", "Copyright © 1993-2018 wxWidgets development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2019 wxWidgets development team\0"
             VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"
             VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8ef8e639e3..0a380c0e8b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1026,6 +1026,17 @@ void wxWindowMSW::MSWUpdateUIState(int action, int state)
     ::SendMessage(GetHwnd(), WM_CHANGEUISTATE, MAKEWPARAM(action, state), 0);
 }
 
+void wxWindowMSW::WXSetPendingFocus(wxWindow* win)
+{
+    for ( wxWindow* parent = this; parent; parent = parent->GetParent() )
+    {
+        parent->WXDoUpdatePendingFocus(win);
+
+        if ( parent->IsTopLevel() )
+            break;
+    }
+}
+
 // ---------------------------------------------------------------------------
 // scrolling stuff
 // ---------------------------------------------------------------------------
@@ -4712,8 +4723,6 @@ bool wxWindowMSW::HandleSysColorChange()
 
 bool wxWindowMSW::HandleDisplayChange()
 {
-    wxDisplay::InvalidateCache();
-
     wxDisplayChangedEvent event;
     event.SetEventObject(this);
 
@@ -7501,6 +7510,21 @@ bool wxWindowMSW::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
     if ( modifiers & wxMOD_WIN )
         win_modifiers |= MOD_WIN;
 
+    // Special compatibility hack: the initial version of this function didn't
+    // use wxMSWKeyboard::WXToVK() at all, which was wrong as the user code is
+    // expected to use WXK_XXX constants and not VK_XXX ones, but as people had
+    // no choice but to use the latter with the previous version of wxWidgets,
+    // now we have to continue accepting VK_XXX here too. So we assume that the
+    // argument is a VK constant and not a WXK one if it looks like this should
+    // be the case based on its value. It helps that all of WXK constants
+    // before WXK_START have the same value as the corresponding VK constants,
+    // with the only exception of WXK_DELETE which is equal to VK_F16 -- and we
+    // consider that the latter is unlikely to be used.
+    if ( keycode >= WXK_START || keycode == WXK_DELETE )
+        keycode = wxMSWKeyboard::WXToVK(keycode);
+    //else: leave it unchanged because it looks like it's a VK constant (which
+    //      includes ASCII digits and upper case letters)
+
     if ( !::RegisterHotKey(GetHwnd(), hotkeyId, win_modifiers, keycode) )
     {
         wxLogLastError(wxT("RegisterHotKey"));
diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index cb1abf26de..591bb674f6 100644
--- a/src/osx/carbon/dataobj.cpp
+++ b/src/osx/carbon/dataobj.cpp
@@ -298,9 +298,9 @@ void wxDataObject::AddToPasteboard( void * pb, wxIntPtr itemID )
             memset( buf, 0, sz );
             if ( GetDataHere( thisFormat, buf ) )
             {
-                wxIntPtr counter = 1 ;
                 if ( thisFormat.GetType() == wxDF_FILENAME )
                 {
+                    wxIntPtr counter = 1;
                     // the data is D-normalized UTF8 strings of filenames delimited with \n
                     char *fname = strtok((char*) buf,"\n");
                     while (fname != NULL)
@@ -398,7 +398,6 @@ bool wxDataObject::GetFromPasteboard( void * pb )
     ItemCount itemCount = 0;
     wxString filenamesPassed;
     bool transferred = false;
-    bool pastelocationset = false;
 
     // we synchronize here once again, so we don't mind which flags get returned
     PasteboardSynchronize( pasteboard );
@@ -406,6 +405,7 @@ bool wxDataObject::GetFromPasteboard( void * pb )
     OSStatus err = PasteboardGetItemCount( pasteboard, &itemCount );
     if ( err == noErr )
     {
+        bool pastelocationset = false;
         for (size_t i = 0; !transferred && i < formatcount; i++)
         {
             // go through the data in our order of preference
diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index 93d0ffe7c2..54ed729d9f 100644
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -183,7 +183,7 @@ namespace
 
     int CTWeightToWX(CGFloat weight)
     {
-        for (int i = 0; i < kCTWeightsCount; ++i)
+        for (int i = 0; i < kCTWeightsCount - 1; ++i)
         {
             if ( (weight - gCTWeights[i]) < (gCTWeights[i+1]-weight) )
                 return i * 100;
@@ -793,13 +793,11 @@ void wxNativeFontInfo::InitFromFontDescriptor(CTFontDescriptorRef desc)
     wxCFDictionaryRef traits((CFDictionaryRef)CTFontDescriptorCopyAttribute(desc, kCTFontTraitsAttribute));
     traits.GetValue(kCTFontSymbolicTrait).GetValue((int32_t*)&symbolicTraits, 0);
 
-    m_family = wxFONTFAMILY_DEFAULT;
-
-    if (symbolicTraits & kCTFontTraitMonoSpace)
+    if (symbolicTraits & kCTFontMonoSpaceTrait)
         m_family = wxFONTFAMILY_TELETYPE;
     else
     {
-        uint32_t stylisticClass = symbolicTraits & kCTFontTraitClassMask;
+        uint32_t stylisticClass = symbolicTraits & kCTFontClassMaskTrait;
 
         if (stylisticClass == kCTFontSansSerifClass)
             m_family = wxFONTFAMILY_SWISS;
diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 0fe428cd20..65fe9c63a3 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -2601,6 +2601,12 @@ public:
         m_image = m_bitmap.ConvertToImage();
     }
 
+    virtual void Flush() wxOVERRIDE
+    {
+      wxMacCoreGraphicsContext::Flush();
+      m_image = m_bitmap.ConvertToImage();
+    }
+
 private:
     wxImage& m_image;
     wxBitmap m_bitmap;
diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index aa124a816d..a7bc8dcc06 100644
--- a/src/osx/carbon/renderer.cpp
+++ b/src/osx/carbon/renderer.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -33,6 +33,7 @@
 #include "wx/splitter.h"
 #include "wx/time.h"
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
     #include "wx/image.h"
@@ -172,11 +173,9 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
     wxHeaderSortIconType sortArrow,
     wxHeaderButtonParams* params )
 {
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14) )
-    {
-        if ( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() < 128 )
-            return wxRendererNative::GetGeneric().DrawHeaderButton(win, dc,  rect, flags, sortArrow, params);
-    }
+    if ( wxSystemSettings::GetAppearance().IsDark() )
+        return wxRendererNative::GetGeneric().DrawHeaderButton(win, dc,  rect, flags, sortArrow, params);
+
     const wxCoord x = rect.x;
     const wxCoord y = rect.y;
     const wxCoord w = rect.width;
@@ -339,7 +338,15 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
     wxOrientation orient,
     int WXUNUSED(flags) )
 {
-    bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL && !wxPlatformInfo::Get().CheckOSVersion(10, 14);
+    // Note that we can't use ternary ?: operator or any other construct with
+    // logical operators here, WX_IS_MACOS_AVAILABLE() must appear inside an
+    // "if" statement to avoid -Wunsupported-availability-guard with Xcode 10.
+    bool hasMetal;
+    if (WX_IS_MACOS_AVAILABLE(10, 14))
+        hasMetal = false;
+    else
+        hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL;
+
     SInt32 height;
 
     height = wxRendererNative::Get().GetSplitterParams(win).widthSash;
@@ -382,7 +389,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
 
         if ( win->HasFlag(wxSP_3DSASH) )
         {
-            if ( !wxPlatformInfo::Get().CheckOSVersion(10, 14) || wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() > 128  )
+            if ( !wxSystemSettings::GetAppearance().IsDark() )
             {
                 HIThemeSplitterDrawInfo drawInfo;
                 drawInfo.version = 0;
diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index 09b872d342..ba19399a55 100644
--- a/src/osx/carbon/statbrma.cpp
+++ b/src/osx/carbon/statbrma.cpp
@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 // Margin between the field text and the field rect
 #define wxFIELD_TEXT_MARGIN 2
@@ -75,33 +76,9 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
 
 void wxStatusBarMac::InitColours()
 {
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-    if ( !wxPlatformInfo::Get().CheckOSVersion(10, 10) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 10) )
     {
-        // 10.9 Mavericks and older:
-        m_textActive = wxColour(0x2F, 0x2F, 0x2F);
-        m_textInactive = wxColour(0x4D, 0x4D, 0x4D);
-        m_bgActiveFrom = wxColour(0xDA, 0xDA, 0xDA);
-        m_bgActiveTo = wxColour(0xA0, 0xA0, 0xA0);
-        m_borderActive = wxColour(0x6E, 0x6E, 0x6E);
-        m_borderInactive = wxColour(0xA3, 0xA3, 0xA3);
-        SetBackgroundColour(wxColour(0xE1, 0xE1, 0xE1)); // inactive bg
-    }
-    else
-#endif // MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-    {
-        if (!wxPlatformInfo::Get().CheckOSVersion(10, 14))
-        {
-            // 10.10 Yosemite to 10.13 :
-            m_textActive = wxColour(0x40, 0x40, 0x40);
-            m_textInactive = wxColour(0x4B, 0x4B, 0x4B);
-            m_bgActiveFrom = wxColour(0xE9, 0xE7, 0xEA);
-            m_bgActiveTo = wxColour(0xCD, 0xCB, 0xCE);
-            m_borderActive = wxColour(0xBA, 0xB8, 0xBB);
-            m_borderInactive = wxColour(0xC3, 0xC3, 0xC3);
-            SetBackgroundColour(wxColour(0xF4, 0xF4, 0xF4)); // inactive bg
-        }
-        else
+        if ( WX_IS_MACOS_AVAILABLE(10, 14) )
         {
             // FIXME: None of this is correct and is only very loose
             //        approximation. 10.14's dark mode uses dynamic colors that
@@ -111,7 +88,7 @@ void wxStatusBarMac::InitColours()
             m_textActive = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT);
             m_textInactive = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
 
-            if ( bg.Red() < 128 )
+            if ( wxSystemSettings::GetAppearance().IsDark() )
             {
                 // dark mode appearance
                 m_textActive = wxColour(0xB0, 0xB0, 0xB0);
@@ -129,7 +106,31 @@ void wxStatusBarMac::InitColours()
             }
             SetBackgroundColour(bg); // inactive bg
         }
+        else
+        {
+            // 10.10 Yosemite to 10.13 :
+            m_textActive = wxColour(0x40, 0x40, 0x40);
+            m_textInactive = wxColour(0x4B, 0x4B, 0x4B);
+            m_bgActiveFrom = wxColour(0xE9, 0xE7, 0xEA);
+            m_bgActiveTo = wxColour(0xCD, 0xCB, 0xCE);
+            m_borderActive = wxColour(0xBA, 0xB8, 0xBB);
+            m_borderInactive = wxColour(0xC3, 0xC3, 0xC3);
+            SetBackgroundColour(wxColour(0xF4, 0xF4, 0xF4)); // inactive bg
+        }
     }
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
+    else
+    {
+        // 10.9 Mavericks and older:
+        m_textActive = wxColour(0x2F, 0x2F, 0x2F);
+        m_textInactive = wxColour(0x4D, 0x4D, 0x4D);
+        m_bgActiveFrom = wxColour(0xDA, 0xDA, 0xDA);
+        m_bgActiveTo = wxColour(0xA0, 0xA0, 0xA0);
+        m_borderActive = wxColour(0x6E, 0x6E, 0x6E);
+        m_borderInactive = wxColour(0xA3, 0xA3, 0xA3);
+        SetBackgroundColour(wxColour(0xE1, 0xE1, 0xE1)); // inactive bg
+    }
+#endif // MAC_OS_X_VERSION_MIN_REQUIRED < 101000
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight)
diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index a9a221bb90..d2ea457e14 100644
--- a/src/osx/carbon/thread.cpp
+++ b/src/osx/carbon/thread.cpp
@@ -1193,8 +1193,8 @@ bool wxThread::IsPaused() const
 class wxThreadModule : public wxModule
 {
 public:
-    virtual bool OnInit();
-    virtual void OnExit();
+    virtual bool OnInit() wxOVERRIDE;
+    virtual void OnExit() wxOVERRIDE;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxThreadModule);
diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index b134feb8e9..c8df9341a8 100644
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -23,6 +23,7 @@
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 #endif
 
 #include "wx/fontutil.h"
@@ -373,17 +374,17 @@ CGImageRef wxOSXCreateCGImageFromImage( WXImage nsimage, double *scaleptr )
 
 #if wxOSX_USE_COCOA
 
-static NSCursor* wxGetStockCursor( short sIndex )
+static NSCursor* wxCreateStockCursor( short sIndex )
 {
-    ClassicCursor* pCursor = &gMacCursors[sIndex];
-
     //Classic mac cursors are 1bps 16x16 black and white with a
     //identical mask that is 1 for on and 0 for off
-    NSImage *theImage = [[NSImage alloc] initWithSize:NSMakeSize(16.0,16.0)];
+    ClassicCursor* pCursor = &gMacCursors[sIndex];
+
+    wxNSObjRef<NSImage*> theImage( [[NSImage alloc] initWithSize:NSMakeSize(16.0,16.0)] );
 
     //NSCursor takes an NSImage takes a number of Representations - here
     //we need only one for the raw data
-    NSBitmapImageRep *theRep = [[NSBitmapImageRep alloc]
+    wxNSObjRef<NSBitmapImageRep*> theRep( [[NSBitmapImageRep alloc]
         initWithBitmapDataPlanes: NULL  // Tell Cocoa to allocate the planes for us.
         pixelsWide: 16      // All classic cursors are 16x16
         pixelsHigh: 16
@@ -393,16 +394,16 @@ static NSCursor* wxGetStockCursor( short sIndex )
         isPlanar: YES       // Use a separate array for each sample
         colorSpaceName: NSCalibratedWhiteColorSpace // 0.0=black 1.0=white
         bytesPerRow: 2      // Rows in each plane are on 2-byte boundaries (no pad)
-        bitsPerPixel: 1];   // same as bitsPerSample since data is planar
+        bitsPerPixel: 1] );   // same as bitsPerSample since data is planar
 
     // Ensure that Cocoa allocated 2 and only 2 of the 5 possible planes
     unsigned char *planes[5];
     [theRep getBitmapDataPlanes:planes];
-    wxASSERT(planes[0] != NULL);
-    wxASSERT(planes[1] != NULL);
-    wxASSERT(planes[2] == NULL);
-    wxASSERT(planes[3] == NULL);
-    wxASSERT(planes[4] == NULL);
+    wxCHECK(planes[0] != NULL, nil);
+    wxCHECK(planes[1] != NULL, nil);
+    wxCHECK(planes[2] == NULL, nil);
+    wxCHECK(planes[3] == NULL, nil);
+    wxCHECK(planes[4] == NULL, nil);
 
     // NOTE1: The Cursor's bits field is white=0 black=1.. thus the bitwise-not
     // Why not use NSCalibratedBlackColorSpace?  Because that reverses the
@@ -436,10 +437,6 @@ static NSCursor* wxGetStockCursor( short sIndex )
                                     hotSpot:NSMakePoint(pCursor->hotspot[1], pCursor->hotspot[0])
                             ];
 
-    //do the usual cleanups
-    [theRep release];
-    [theImage release];
-
     //return the new cursor
     return theCursor;
 }
@@ -459,7 +456,7 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
         // according to the HIG
         // cursor = [[NSCursor arrowCursor] retain];
         // but for crossplatform compatibility we display a watch cursor
-        cursor = wxGetStockCursor(kwxCursorWatch);
+        cursor = wxCreateStockCursor(kwxCursorWatch);
         break;
 
     case wxCURSOR_IBEAM:
@@ -471,11 +468,11 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
         break;
 
     case wxCURSOR_SIZENWSE:
-        cursor = wxGetStockCursor(kwxCursorSizeNWSE);
+        cursor = wxCreateStockCursor(kwxCursorSizeNWSE);
         break;
 
     case wxCURSOR_SIZENESW:
-        cursor = wxGetStockCursor(kwxCursorSizeNESW);
+        cursor = wxCreateStockCursor(kwxCursorSizeNESW);
         break;
 
     case wxCURSOR_SIZEWE:
@@ -487,7 +484,7 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
         break;
 
     case wxCURSOR_SIZING:
-        cursor = wxGetStockCursor(kwxCursorSize);
+        cursor = wxCreateStockCursor(kwxCursorSize);
         break;
 
     case wxCURSOR_HAND:
@@ -495,47 +492,47 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
         break;
 
     case wxCURSOR_BULLSEYE:
-        cursor = wxGetStockCursor(kwxCursorBullseye);
+        cursor = wxCreateStockCursor(kwxCursorBullseye);
         break;
 
     case wxCURSOR_PENCIL:
-        cursor = wxGetStockCursor(kwxCursorPencil);
+        cursor = wxCreateStockCursor(kwxCursorPencil);
         break;
 
     case wxCURSOR_MAGNIFIER:
-        cursor = wxGetStockCursor(kwxCursorMagnifier);
+        cursor = wxCreateStockCursor(kwxCursorMagnifier);
         break;
 
     case wxCURSOR_NO_ENTRY:
-        cursor = wxGetStockCursor(kwxCursorNoEntry);
+        cursor = wxCreateStockCursor(kwxCursorNoEntry);
         break;
 
     case wxCURSOR_PAINT_BRUSH:
-        cursor = wxGetStockCursor(kwxCursorPaintBrush);
+        cursor = wxCreateStockCursor(kwxCursorPaintBrush);
         break;
 
     case wxCURSOR_POINT_LEFT:
-        cursor = wxGetStockCursor(kwxCursorPointLeft);
+        cursor = wxCreateStockCursor(kwxCursorPointLeft);
         break;
 
     case wxCURSOR_POINT_RIGHT:
-        cursor = wxGetStockCursor(kwxCursorPointRight);
+        cursor = wxCreateStockCursor(kwxCursorPointRight);
         break;
 
     case wxCURSOR_QUESTION_ARROW:
-        cursor = wxGetStockCursor(kwxCursorQuestionArrow);
+        cursor = wxCreateStockCursor(kwxCursorQuestionArrow);
         break;
 
     case wxCURSOR_BLANK:
-        cursor = wxGetStockCursor(kwxCursorBlank);
+        cursor = wxCreateStockCursor(kwxCursorBlank);
         break;
 
     case wxCURSOR_RIGHT_ARROW:
-        cursor = wxGetStockCursor(kwxCursorRightArrow);
+        cursor = wxCreateStockCursor(kwxCursorRightArrow);
         break;
 
     case wxCURSOR_SPRAYCAN:
-        cursor = wxGetStockCursor(kwxCursorRoller);
+        cursor = wxCreateStockCursor(kwxCursorRoller);
         break;
 
     case wxCURSOR_OPEN_HAND:
@@ -546,15 +543,21 @@ WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type )
         cursor = [[NSCursor closedHandCursor] retain];
         break;
 
-    case wxCURSOR_CHAR:
     case wxCURSOR_ARROW:
+        cursor = [[NSCursor arrowCursor] retain];
+        break;
+
+    case wxCURSOR_CHAR:
     case wxCURSOR_LEFT_BUTTON:
     case wxCURSOR_RIGHT_BUTTON:
     case wxCURSOR_MIDDLE_BUTTON:
     default:
-        cursor = [[NSCursor arrowCursor] retain];
         break;
     }
+    
+    if ( cursor == nil )
+        cursor = [[NSCursor arrowCursor] retain];
+    
     return cursor;
 }
 
@@ -624,7 +627,7 @@ NSString* wxNSStringWithWxString(const wxString &wxstring)
 wxOSXEffectiveAppearanceSetter::wxOSXEffectiveAppearanceSetter()
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
     {
         formerAppearance = NSAppearance.currentAppearance;
         NSAppearance.currentAppearance = NSApp.effectiveAppearance;
@@ -637,7 +640,7 @@ wxOSXEffectiveAppearanceSetter::wxOSXEffectiveAppearanceSetter()
 wxOSXEffectiveAppearanceSetter::~wxOSXEffectiveAppearanceSetter()
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
         NSAppearance.currentAppearance = (NSAppearance*) formerAppearance;
 #endif
 }
diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 9c3e975694..73d53f0892 100644
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -171,11 +171,6 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap *WXUNUSED(bitmap))
     wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented"));
 }
 
-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
-}
-
 void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))
 {
     // TODO
diff --git a/src/osx/cocoa/aboutdlg.mm b/src/osx/cocoa/aboutdlg.mm
index 45b5456c76..23061c98fc 100644
--- a/src/osx/cocoa/aboutdlg.mm
+++ b/src/osx/cocoa/aboutdlg.mm
@@ -3,7 +3,7 @@
 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index 32d6ae8c8c..3ff2f389c7 100644
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -12,6 +12,7 @@
 #include "wx/colour.h"
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 class wxNSColorRefData : public wxColourRefData
 {
@@ -104,7 +105,7 @@ bool wxNSColorRefData::IsSolid() const
 CGColorRef wxNSColorRefData::GetCGColor() const
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-    if (wxPlatformInfo::Get().CheckOSVersion(10, 8)) {
+    if ( WX_IS_MACOS_AVAILABLE(10, 8) ) {
         wxOSXEffectiveAppearanceSetter helper;
         return [m_nsColour CGColor];
     }
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 6842102502..4b881b6315 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 #include "wx/osx/cocoa/dataview.h"
 #include "wx/renderer.h"
 #include "wx/stopwatch.h"
@@ -2956,14 +2957,14 @@ bool wxDataViewTextRenderer::MacRender()
             // Tightening looks very ugly when combined with non-tightened rows,
             // so disabled it on OS X version where it's used:
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
-            if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_11)
+            if ( WX_IS_MACOS_AVAILABLE(10, 11) )
             {
                 [par setAllowsDefaultTighteningForTruncation:NO];
             }
             else
 #endif
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
-            if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_10)
+            if ( WX_IS_MACOS_AVAILABLE(10, 10) )
             {
                 [par setTighteningFactorForTruncation:0.0];
             }
diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index 26169f86ab..f0a0425e07 100644
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm
index e3486a8117..03219a0774 100644
--- a/src/osx/cocoa/mediactrl.mm
+++ b/src/osx/cocoa/mediactrl.mm
@@ -31,6 +31,7 @@
 #include "wx/mediactrl.h"
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 #if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 && defined(__LP64__)
     #define wxOSX_USE_AVKIT 1
@@ -162,7 +163,7 @@ private:
         id val = [change objectForKey:NSKeyValueChangeNewKey];
         if ( val != [NSNull null ] )
         {
-            AVPlayerStatus status = (AVPlayerStatus) [ val integerValue];
+            AVPlayerItemStatus status = (AVPlayerItemStatus) [ val integerValue];
 
             switch (status)
             {
@@ -276,6 +277,7 @@ private:
 
 #if wxOSX_USE_AVKIT
 
+WX_API_AVAILABLE_MACOS(10, 10)
 @interface wxAVPlayerView : AVPlayerView
 {
 }
@@ -395,7 +397,7 @@ bool wxAVMediaBackend::CreateControl(wxControl* inctrl, wxWindow* parent,
 
     WXWidget view = NULL;
 #if wxOSX_USE_AVKIT
-    if ( NSClassFromString(@"AVPlayerView") )
+    if ( WX_IS_MACOS_AVAILABLE(10, 10) )
     {
         view = [[wxAVPlayerView alloc] initWithFrame: r player:m_player];
         [(wxAVPlayerView*) view setControlsStyle:AVPlayerViewControlsStyleNone];
@@ -563,14 +565,17 @@ bool wxAVMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
 void wxAVMediaBackend::DoShowPlayerControls(wxMediaCtrlPlayerControls flags)
 {
 #if wxOSX_USE_AVKIT
-    NSView* view = m_ctrl->GetHandle();
-    if ( [view isKindOfClass:[wxAVPlayerView class]] )
+    if ( WX_IS_MACOS_AVAILABLE(10, 10) )
     {
-        wxAVPlayerView* playerView = (wxAVPlayerView*) view;
-        if (flags == wxMEDIACTRLPLAYERCONTROLS_NONE )
-            playerView.controlsStyle = AVPlayerViewControlsStyleNone;
-        else
-            playerView.controlsStyle = AVPlayerViewControlsStyleDefault;
+        NSView* view = m_ctrl->GetHandle();
+        if ( [view isKindOfClass:[wxAVPlayerView class]] )
+        {
+            wxAVPlayerView* playerView = (wxAVPlayerView*) view;
+            if (flags == wxMEDIACTRLPLAYERCONTROLS_NONE )
+                playerView.controlsStyle = AVPlayerViewControlsStyleNone;
+            else
+                playerView.controlsStyle = AVPlayerViewControlsStyleDefault;
+        }
     }
 #endif
 }
diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index d6aaa2450a..8c54ad4a53 100644
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -254,6 +254,7 @@ public :
             [windowMenuItem setSubmenu:windowMenu];
             [windowMenu release];
             [m_osxMenu addItem:windowMenuItem];
+            [windowMenuItem release];
         }
         return windowMenu;
     }
@@ -361,8 +362,11 @@ public :
         [m_osxMenu setAutoenablesItems:NO];
         
         wxMenu* menu = GetWXPeer();
-        for ( auto item : menu->GetMenuItems() )
+        for ( wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
+              node;
+              node = node->GetNext() )
         {
+            const wxMenuItem* const item = node->GetData();
             if ( item->IsSubMenu() )
             {
                 wxMenuCocoaImpl* subimpl = dynamic_cast<wxMenuCocoaImpl*>(item->GetSubMenu()->GetPeer());
diff --git a/src/osx/cocoa/notifmsg.mm b/src/osx/cocoa/notifmsg.mm
index 2d048f4826..1bed2809c3 100644
--- a/src/osx/cocoa/notifmsg.mm
+++ b/src/osx/cocoa/notifmsg.mm
@@ -31,6 +31,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 #include "wx/generic/notifmsg.h"
 #include "wx/private/notifmsg.h"
 #include "wx/generic/private/notifmsg.h"
@@ -43,6 +44,7 @@
 #include "wx/utils.h"
 #include <map>
 
+WX_API_AVAILABLE_MACOS(10, 8)
 @interface wxUserNotificationHandler : NSObject <NSUserNotificationCenterDelegate>
 
 @end
@@ -51,7 +53,7 @@
 // wxUserNotificationMsgImpl
 // ----------------------------------------------------------------------------
 
-class wxUserNotificationMsgImpl : public wxNotificationMessageImpl
+class WX_API_AVAILABLE_MACOS(10, 8) wxUserNotificationMsgImpl : public wxNotificationMessageImpl
 {
 public:
     wxUserNotificationMsgImpl(wxNotificationMessageBase* notification) :
@@ -121,7 +123,7 @@ public:
     {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
         // Additional icon in the notification is only supported on OS X 10.9+
-        if ([NSUserNotification instancesRespondToSelector:@selector(setContentImage:)])
+        if ( WX_IS_MACOS_AVAILABLE(10, 9) )
             m_notif.contentImage = icon.GetNSImage();
 #endif
     }
@@ -247,7 +249,7 @@ void wxNotificationMessage::Init()
 {
     // Native notifications are not available prior to 10.8, fallback
     // to generic ones on 10.7
-    if (wxPlatformInfo::Get().CheckOSVersion(10, 8))
+    if ( WX_IS_MACOS_AVAILABLE(10, 8) )
         m_impl = new wxUserNotificationMsgImpl(this);
     else
         m_impl = new wxGenericNotificationMessageImpl(this);
diff --git a/src/osx/cocoa/power.mm b/src/osx/cocoa/power.mm
index 28d6b89781..9359c1ea89 100644
--- a/src/osx/cocoa/power.mm
+++ b/src/osx/cocoa/power.mm
@@ -15,8 +15,8 @@
 
 #include "wx/power.h"
 #include "wx/atomic.h"
-#include "wx/platinfo.h"
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 #include <IOKit/pwr_mgt/IOPMLib.h>
 
@@ -38,7 +38,7 @@ bool UpdatePowerResourceUsage(wxPowerResourceKind kind, const wxString& reason)
             cfreason = wxString("User Activity");
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
-        if ( wxPlatformInfo::Get().CheckOSVersion(10, 9) )
+        if ( WX_IS_MACOS_AVAILABLE(10, 9) )
         {
             // Use NSProcessInfo for 10.9 and newer
             if ( !g_processInfoActivity )
@@ -83,7 +83,7 @@ bool UpdatePowerResourceUsage(wxPowerResourceKind kind, const wxString& reason)
     {
         // Release power assertion
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
-        if ( wxPlatformInfo::Get().CheckOSVersion(10, 9) )
+        if ( WX_IS_MACOS_AVAILABLE(10, 9) )
         {
             // Use NSProcessInfo for 10.9 and newer
             if ( g_processInfoActivity )
diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
index 121ef1b699..fc39244e18 100644
--- a/src/osx/cocoa/settings.mm
+++ b/src/osx/cocoa/settings.mm
@@ -19,6 +19,7 @@
 
 #include "wx/osx/core/private.h"
 #include "wx/osx/cocoa/private.h"
+#include "wx/osx/private/available.h"
 
 #import <AppKit/NSColor.h>
 #import <Foundation/Foundation.h>
@@ -41,6 +42,39 @@ static int wxOSXGetUserDefault(NSString* key, int defaultValue)
     return [setting intValue];
 }
 
+// ----------------------------------------------------------------------------
+// wxSystemAppearance
+// ----------------------------------------------------------------------------
+
+wxString wxSystemAppearance::GetName() const
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
+    if ( WX_IS_MACOS_AVAILABLE(10, 9) )
+    {
+        return wxStringWithNSString([[NSApp effectiveAppearance] name]);
+    }
+#endif
+
+    return wxString();
+}
+
+bool wxSystemAppearance::IsDark() const
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
+    if ( WX_IS_MACOS_AVAILABLE(10, 14) )
+    {
+        const NSAppearanceName
+            appearanceName = [[NSApp effectiveAppearance]
+                                bestMatchFromAppearancesWithNames:
+                                @[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
+
+        return [appearanceName isEqualToString:NSAppearanceNameDarkAqua];
+    }
+#endif
+
+    // Fall back on the generic method when not running under 10.14.
+    return IsUsingDarkBackground();
+}
 
 // ----------------------------------------------------------------------------
 // wxSystemSettingsNative
@@ -79,7 +113,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         sysColor = [NSColor controlBackgroundColor];
         break;
     case wxSYS_COLOUR_BTNFACE:
-        if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+        if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
             sysColor = [NSColor windowBackgroundColor];
         else
             sysColor = [NSColor controlColor];
diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index b37e841a6f..25cc3aa2a1 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -19,6 +19,7 @@
 #include "wx/toolbar.h"
 #include "wx/app.h"
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 #include "wx/geometry.h"
 #include "wx/sysopt.h"
 
@@ -1674,8 +1675,14 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
         wxRect rect(0,0,w,h);
         
         //  TODO determine whether to use flat appearance in earlier system
-        if ( !wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+        if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
+        {
+            // No gradient.
+        }
+        else
+        {
             dc.GradientFillLinear( rect , wxColour( 0xCC,0xCC,0xCC ), wxColour( 0xA8,0xA8,0xA8 ) , wxSOUTH );
+        }
         
         dc.SetPen( wxPen( wxColour( 0x51,0x51,0x51 ) ) );
         if ( HasFlag(wxTB_LEFT) )
diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 0efbf083ab..de24c5484e 100644
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -26,6 +26,7 @@
 #include "wx/apptrait.h"
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 #if wxUSE_GUI
 #if wxOSX_USE_COCOA_OR_CARBON
@@ -349,7 +350,7 @@ void wxBell()
     ProcessSerialNumber psn = { 0, kCurrentProcess };
     TransformProcessType(&psn, kProcessTransformToForegroundApplication);
     
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 9) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 9) )
     {
         [[NSRunningApplication currentApplication] activateWithOptions:
          (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
@@ -426,23 +427,26 @@ bool wxApp::CallOnInit()
     m_onInitResult = false;
     m_inited = false;
 
-    // Feed the upcoming event loop with a dummy event. Without this,
-    // [NSApp run] below wouldn't return, as we expect it to, if the
-    // application was launched without being activated and would block
-    // until the dock icon was clicked - delaying OnInit() call too.
-    NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
+    if ( !sm_isEmbedded )
+    {
+        // Feed the upcoming event loop with a dummy event. Without this,
+        // [NSApp run] below wouldn't return, as we expect it to, if the
+        // application was launched without being activated and would block
+        // until the dock icon was clicked - delaying OnInit() call too.
+        NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined
                                     location:NSMakePoint(0.0, 0.0)
                                modifierFlags:0
                                    timestamp:0
                                 windowNumber:0
                                      context:nil
                                      subtype:0 data1:0 data2:0];
-    [NSApp postEvent:event atStart:FALSE];
-    [NSApp run];
+        [NSApp postEvent:event atStart:FALSE];
+        [NSApp run];
+    }
 
     m_onInitResult = OnInit();
     m_inited = true;
-    if ( m_onInitResult )
+    if ( !sm_isEmbedded && m_onInitResult )
     {
         if ( m_openFiles.GetCount() > 0 )
             MacOpenFiles(m_openFiles);
diff --git a/src/osx/cocoa/utils_base.mm b/src/osx/cocoa/utils_base.mm
index 97e06079a6..ccac04e320 100644
--- a/src/osx/cocoa/utils_base.mm
+++ b/src/osx/cocoa/utils_base.mm
@@ -32,6 +32,13 @@
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
 {
 #ifdef wxHAS_NSPROCESSINFO
+    // Note: we don't use WX_IS_MACOS_AVAILABLE() here because these properties
+    // are only officially supported since 10.10, but are actually available
+    // under 10.9 too, so we prefer to check for them explicitly and suppress
+    // the warnings that using without a __builtin_available() check around
+    // them generates.
+    wxCLANG_WARNING_SUPPRESS(unguarded-availability)
+
     if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)])
     {
         NSOperatingSystemVersion osVer = [NSProcessInfo processInfo].operatingSystemVersion;
@@ -45,6 +52,9 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin, int *verMicro)
         if ( verMicro != NULL )
             *verMicro = osVer.patchVersion;
     }
+
+    wxCLANG_WARNING_RESTORE(unguarded-availability)
+
     else
 #endif
     {
@@ -79,6 +89,10 @@ wxGCC_WARNING_RESTORE()
 bool wxCheckOsVersion(int majorVsn, int minorVsn, int microVsn)
 {
 #ifdef wxHAS_NSPROCESSINFO
+    // As above, this API is effectively available earlier than its
+    // availability attribute indicates, so check for it manually.
+    wxCLANG_WARNING_SUPPRESS(unguarded-availability)
+
     if ([NSProcessInfo instancesRespondToSelector:@selector(isOperatingSystemAtLeastVersion:)])
     {
         NSOperatingSystemVersion osVer;
@@ -88,6 +102,9 @@ bool wxCheckOsVersion(int majorVsn, int minorVsn, int microVsn)
 
         return [[NSProcessInfo processInfo] isOperatingSystemAtLeastVersion:osVer] != NO;
     }
+
+    wxCLANG_WARNING_RESTORE(unguarded-availability)
+
     else
 #endif
     {
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index fa157a9442..6f570d531e 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -21,6 +21,7 @@
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"
+    #include "wx/osx/private/available.h"
 #endif
 
 #include "wx/evtloop.h"
@@ -1092,6 +1093,7 @@ void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text)
 }
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_panGestureEvent(NSView* self, SEL _cmd, NSPanGestureRecognizer* panGestureRecognizer)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1101,6 +1103,7 @@ void wxOSX_panGestureEvent(NSView* self, SEL _cmd, NSPanGestureRecognizer* panGe
     impl->PanGestureEvent(panGestureRecognizer);
 }
 
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_zoomGestureEvent(NSView* self, SEL _cmd, NSMagnificationGestureRecognizer* magnificationGestureRecognizer)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1110,6 +1113,7 @@ void wxOSX_zoomGestureEvent(NSView* self, SEL _cmd, NSMagnificationGestureRecogn
     impl->ZoomGestureEvent(magnificationGestureRecognizer);
 }
 
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_rotateGestureEvent(NSView* self, SEL _cmd, NSRotationGestureRecognizer* rotationGestureRecognizer)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1119,6 +1123,7 @@ void wxOSX_rotateGestureEvent(NSView* self, SEL _cmd, NSRotationGestureRecognize
     impl->RotateGestureEvent(rotationGestureRecognizer);
 }
 
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_longPressEvent(NSView* self, SEL _cmd, NSPressGestureRecognizer* pressGestureRecognizer)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1128,6 +1133,7 @@ void wxOSX_longPressEvent(NSView* self, SEL _cmd, NSPressGestureRecognizer* pres
     impl->LongPressEvent(pressGestureRecognizer);
 }
 
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_touchesBegan(NSView* self, SEL _cmd, NSEvent *event)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1137,6 +1143,7 @@ void wxOSX_touchesBegan(NSView* self, SEL _cmd, NSEvent *event)
     impl->TouchesBegan(event);
 }
 
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_touchesMoved(NSView* self, SEL _cmd, NSEvent *event)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1146,6 +1153,7 @@ void wxOSX_touchesMoved(NSView* self, SEL _cmd, NSEvent *event)
     impl->TouchesMoved(event);
 }
 
+WX_API_AVAILABLE_MACOS(10, 10)
 void wxOSX_touchesEnded(NSView* self, SEL _cmd, NSEvent *event)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -1545,7 +1553,7 @@ void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
 
 // Class containing data used for gestures support.
-class wxCocoaGesturesImpl
+class WX_API_AVAILABLE_MACOS(10, 10) wxCocoaGesturesImpl
 {
 public:
     wxCocoaGesturesImpl(wxWidgetCocoaImpl* impl, NSView* view, int eventsMask)
@@ -1669,6 +1677,12 @@ private:
 // itself because most windows don't need it and it seems wasteful to
 // always increase their size unnecessarily.
 
+// wxCocoaGesturesImpl is only used under 10.10+ and so clang warns about
+// wxCocoaGesturesImplMap not having 10.10 availability attribute, but there is
+// no simple way to make it pass through the macro, so just suppress the
+// warning instead.
+wxCLANG_WARNING_SUPPRESS(unguarded-availability)
+
 #include "wx/hashmap.h"
 WX_DECLARE_HASH_MAP(wxWidgetCocoaImpl*, wxCocoaGesturesImpl*,
                     wxPointerHash, wxPointerEqual,
@@ -1679,6 +1693,8 @@ typedef wxExternalField<wxWidgetCocoaImpl,
                         wxCocoaGesturesImpl,
                         wxCocoaGesturesImplMap> wxCocoaGestures;
 
+wxCLANG_WARNING_RESTORE(unguarded-availability)
+
 void wxWidgetCocoaImpl::PanGestureEvent(NSPanGestureRecognizer* panGestureRecognizer)
 {
     NSGestureRecognizerState gestureState;
@@ -2578,7 +2594,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible )
     
     // trigger redraw upon shown for layer-backed views
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
         if( !m_osxView.isHiddenOrHasHiddenAncestor )
             SetNeedsDisplay(NULL);
 #endif
@@ -3033,7 +3049,11 @@ void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &hei
     }
 }
 
-static void SetSubviewsNeedDisplay( NSView *view )
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
+namespace
+{
+    
+void SetSubviewsNeedDisplay( NSView *view )
 {
     for ( NSView *sub in view.subviews )
     {
@@ -3044,6 +3064,10 @@ static void SetSubviewsNeedDisplay( NSView *view )
         SetSubviewsNeedDisplay(sub);
     }
 }
+    
+}
+#endif
+
 
 void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )
 {
@@ -3056,7 +3080,7 @@ void wxWidgetCocoaImpl::SetNeedsDisplay( const wxRect* where )
     // their children implicitly redrawn with the parent. For compatibility,
     // do it manually here:
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 14 ) )
         SetSubviewsNeedDisplay(m_osxView);
 #endif
 }
@@ -3525,7 +3549,7 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
 bool wxWidgetCocoaImpl::EnableTouchEvents(int eventsMask)
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 10) )
+    if ( WX_IS_MACOS_AVAILABLE(10, 10) )
     {
         if ( HasUserMouseHandling() )
         {
@@ -3539,12 +3563,15 @@ bool wxWidgetCocoaImpl::EnableTouchEvents(int eventsMask)
             }
             else // We do want to have gesture events.
             {
+                // clang does not see that the owning object always destroys its extra field
+#ifndef __clang_analyzer__
                 wxCocoaGestures::StoreForObject
                 (
                     this,
                     new wxCocoaGesturesImpl(this, m_osxView, eventsMask)
                 );
-
+#endif
+                
                 [m_osxView setAcceptsTouchEvents:YES];
             }
 
diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index fcfb40816b..7ea3fa4626 100644
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -55,7 +55,7 @@ public:
 
     virtual ~wxBitmapRefData();
 
-    bool IsOk() const;
+    bool IsOk() const wxOVERRIDE;
 
     void Free();
 
@@ -857,10 +857,10 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
             for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += GetBitmapData()->GetBytesPerRow() )
             {
                 unsigned char* destination = destptr;
-                int index, bit, mask;
 
                 for ( int x = 0 ; x < the_width ; ++x )
                 {
+                    int index, bit, mask;
                     index = x / 8 ;
                     bit = x % 8 ;
                     mask = 1 << bit ;
@@ -1026,8 +1026,8 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
         {
             int sourcelinesize = GetBitmapData()->GetBytesPerRow() ;
             int destlinesize = ret.GetBitmapData()->GetBytesPerRow() ;
-            unsigned char *source = sourcedata + int(rect.x * scale * 4 + rect.y *scale * sourcelinesize) ;
-            unsigned char *dest = destdata ;
+            unsigned char* source = sourcedata + size_t(rect.x * scale) * 4 + size_t(rect.y * scale) * sourcelinesize;
+            unsigned char* dest = destdata;
 
             for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
             {
@@ -1311,11 +1311,11 @@ wxImage wxBitmap::ConvertToImage() const
     {
         unsigned char * maskp = mask ;
         const wxUint32 * source = (wxUint32*)sourcestart;
-        unsigned char a, r, g, b;
 
         for (int xx = 0; xx < width; xx++)
         {
             const wxUint32 color = *source++;
+            unsigned char a, r, g, b;
 #ifdef WORDS_BIGENDIAN
             a = ((color&0xFF000000) >> 24) ;
             r = ((color&0x00FF0000) >> 16) ;
diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 3f15e6edeb..3f71cbe5ed 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 CGColorSpaceRef wxMacGetGenericRGBColorSpace();
 
@@ -118,7 +119,7 @@ wxCGColorRefData::wxCGColorRefData(CGColorRef col)
     else if (model != kCGColorSpaceModelRGB)
     {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
-        if (wxPlatformInfo::Get().CheckOSVersion(10, 11))
+        if ( WX_IS_MACOS_AVAILABLE(10, 11) )
         {
             rgbacol = CGColorCreateCopyByMatchingToColorSpace(wxMacGetGenericRGBColorSpace(), kCGRenderingIntentDefault, col, NULL);
             noComp = CGColorGetNumberOfComponents(rgbacol);
diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index cf47209311..dfb6950997 100644
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -235,7 +235,7 @@ int wxJoystick::GetButtonState() const
 
 bool wxJoystick::GetButtonState(unsigned int id) const
 {
-    if (id > sizeof(int) * 8)
+    if (id >= sizeof(int) * 8)
         return false;
 
     return (GetButtonState() & (1 << id)) != 0;
@@ -859,20 +859,20 @@ void* wxJoystickThread::Entry()
 #endif
 
         //is the cookie a button?
-        if (nIndex < 40)
+        if (nIndex < 32)
         {
             if (hidevent.value)
             {
-                pThis->m_buttons |= (1 << nIndex);
+                pThis->m_buttons |= (1u << nIndex);
                 wxevent.SetEventType(wxEVT_JOY_BUTTON_DOWN);
             }
             else
             {
-                pThis->m_buttons &= ~(1 << nIndex);
+                pThis->m_buttons &= ~(1u << nIndex);
                 wxevent.SetEventType(wxEVT_JOY_BUTTON_UP);
             }
 
-            wxevent.SetButtonChange(1 << nIndex);
+            wxevent.SetButtonChange(1u << nIndex);
         }
         else if (nIndex == wxJS_AXIS_X)
         {
diff --git a/src/osx/core/mimetype.cpp b/src/osx/core/mimetype.cpp
index afc4562694..1ad1c4b316 100644
--- a/src/osx/core/mimetype.cpp
+++ b/src/osx/core/mimetype.cpp
@@ -133,15 +133,13 @@ bool CheckDocTypeMatchesExt( CFDictionaryRef docType, CFStringRef requiredExt )
 // if a match is found, or null otherwise
 CFDictionaryRef GetDocTypeForExt( CFTypeRef docTypeData, CFStringRef requiredExt )
 {
-    CFDictionaryRef docType;
-    CFArrayRef docTypes;
-    CFTypeRef item;
-
     if( !docTypeData )
         return NULL;
 
     if( CFGetTypeID( docTypeData ) == CFArrayGetTypeID() )
     {
+        CFTypeRef item;
+        CFArrayRef docTypes;
         docTypes = reinterpret_cast< CFArrayRef >( docTypeData );
 
         for( CFIndex i = 0, n = CFArrayGetCount( docTypes ); i < n; i++ )
@@ -150,6 +148,7 @@ CFDictionaryRef GetDocTypeForExt( CFTypeRef docTypeData, CFStringRef requiredExt
 
             if( CFGetTypeID( item ) == CFDictionaryGetTypeID() )
             {
+                CFDictionaryRef docType;
                 docType = reinterpret_cast< CFDictionaryRef >( item );
 
                 if( CheckDocTypeMatchesExt( docType, requiredExt ) )
diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index c14c376226..1e96df18a2 100644
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -113,11 +113,10 @@ void wxOSXPrintData::UpdateToPMState()
 void wxOSXPrintData::TransferPrinterNameFrom( const wxPrintData &data )
 {
     CFArrayRef printerList;
-    CFIndex index, count;
-    CFStringRef name;
 
     if (PMServerCreatePrinterList(kPMServerLocal, &printerList) == noErr)
     {
+        CFIndex index, count;
         PMPrinter printer = NULL;
         count = CFArrayGetCount(printerList);
         for (index = 0; index < count; index++)
@@ -127,6 +126,7 @@ void wxOSXPrintData::TransferPrinterNameFrom( const wxPrintData &data )
                 break;
             else
             {
+                CFStringRef name;
                 name = PMPrinterGetName(printer);
                 CFRetain(name);
                 if (data.GetPrinterName() == wxCFStringRef(name).AsString())
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 57a1cf3970..30107475e3 100644
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -667,13 +667,10 @@ wxDataViewWidgetImpl* wxDataViewCtrl::GetDataViewPeer() const
 
 void wxDataViewCtrl::AddChildren(wxDataViewItem const& parentItem)
 {
-  int noOfChildren;
-
   wxDataViewItemArray items;
 
-
   wxCHECK_RET(GetModel() != NULL,"Model pointer not initialized.");
-  noOfChildren = GetModel()->GetChildren(parentItem,items);
+  GetModel()->GetChildren(parentItem,items);
   (void) GetModel()->ItemsAdded(parentItem,items);
 }
 
diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm
index cc8a3a8f95..f051fd49b5 100644
--- a/src/osx/iphone/evtloop.mm
+++ b/src/osx/iphone/evtloop.mm
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 90fd3338d4..e97d1b6c88 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -248,7 +248,6 @@ wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults
     int lbHeight;
-    int wLine;
 
     {
         wxClientDC dc(const_cast<wxListBox*>(this));
@@ -261,8 +260,7 @@ wxSize wxListBox::DoGetBestSize() const
 
             wxCoord width, height ;
             dc.GetTextExtent( str , &width, &height);
-            wLine = width ;
-            lbWidth = wxMax( lbWidth, wLine );
+            lbWidth = wxMax( lbWidth, width );
         }
 
         // Add room for the scrollbar
@@ -284,11 +282,6 @@ wxSize wxListBox::DoGetBestSize() const
     return wxSize( lbWidth, lbHeight );
 }
 
-void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
-{
-    wxControl::Refresh( eraseBack, rect );
-}
-
 // Some custom controls depend on this
 /* static */ wxVisualAttributes
 wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index 02b1e8e16a..60b3e466a3 100644
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -699,16 +699,6 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     return true;
 }
 
-void wxMenuBar::Detach()
-{
-    wxMenuBarBase::Detach() ;
-}
-
-void wxMenuBar::Attach(wxFrame *frame)
-{
-    wxMenuBarBase::Attach( frame ) ;
-}
-
 void wxMenuBar::DoGetPosition(int *x, int *y) const
 {
     int _x,_y,_width,_height;
diff --git a/src/osx/palette.cpp b/src/osx/palette.cpp
index 428db12d2a..e0519daa13 100644
--- a/src/osx/palette.cpp
+++ b/src/osx/palette.cpp
@@ -99,11 +99,11 @@ int wxPalette::GetPixel(unsigned char red, unsigned char green, unsigned char bl
 
     long bestdiff = 3 * 256 ;
     long bestpos = 0 ;
-    long currentdiff ;
 
     for ( int i = 0  ; i < M_PALETTEDATA->m_count ; ++i )
     {
         const wxColour& col = M_PALETTEDATA->m_palette[i] ;
+        long currentdiff;
         currentdiff = abs ( col.Red() - red ) + abs( col.Green() - green ) + abs ( col.Blue() - blue )  ;
         if ( currentdiff < bestdiff )
         {
diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 4d0e06b92a..50dbb33b2f 100644
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -193,13 +193,6 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const
     return current->IsEnabled();
 }
 
-// Returns the radiobox label
-//
-wxString wxRadioBox::GetLabel() const
-{
-    return wxControl::GetLabel();
-}
-
 // Returns the label for the given button
 //
 wxString wxRadioBox::GetString(unsigned int item) const
@@ -238,13 +231,6 @@ int wxRadioBox::GetSelection() const
     return i;
 }
 
-// Sets the radiobox label
-//
-void wxRadioBox::SetLabel(const wxString& label)
-{
-    return wxControl::SetLabel( label );
-}
-
 // Sets the label of a given button
 //
 void wxRadioBox::SetString(unsigned int item,const wxString& label)
@@ -368,7 +354,6 @@ void wxRadioBox::SetFocus()
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
-    int i;
     wxRadioButton *current;
 
     // define the position
@@ -470,6 +455,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     y_offset = y_start;
 
     current = m_radioButtonCycle;
+    int i;
     for (i = 0 ; i < (int)m_noItems; i++)
     {
         // not to do for the zero button!
diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index 8a4cad4a1a..517d8c1780 100644
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -397,9 +397,7 @@ wxSize wxSlider::DoGetBestSize() const
 
 void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {
-    int yborder = 0;
     int minValWidth, maxValWidth, textheight;
-    int sliderBreadth;
     int width = w;
 
     if (GetWindowStyle() & wxSL_LABELS)
@@ -444,9 +442,11 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 
         GetTextExtent(text, &valValWidth, &ht);
 
+        int yborder;
         yborder = textheight + wxSLIDER_BORDERTEXT;
 
         // Get slider breadth
+        int sliderBreadth;
         if (GetWindowStyle() & wxSL_AUTOTICKS)
             sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS;
         else
@@ -500,11 +500,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
     m_minWidth = minWidth;
 }
 
-void wxSlider::DoMoveWindow(int x, int y, int width, int height)
-{
-    wxControl::DoMoveWindow( x, y, width, height );
-}
-
 // Common processing to invert slider values based on wxSL_INVERSE
 int wxSlider::ValueInvertOrNot(int value) const
 {
diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 1ef8afa420..2eeea31854 100644
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -186,12 +186,6 @@ bool wxTextCtrl::IsModified() const
     return m_dirty;
 }
 
-bool wxTextCtrl::AcceptsFocus() const
-{
-    // we don't want focus if we can't be edited
-    return /*IsEditable() && */ wxControl::AcceptsFocus();
-}
-
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     int wText = -1;
diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index be3f646872..f818b090f5 100644
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -137,17 +137,23 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
             [[WebViewLoadDelegate alloc] initWithWxWindow: this];
 
     [m_webView setFrameLoadDelegate:loadDelegate];
+    
+    m_loadDelegate = loadDelegate;
 
     // this is used to veto page loads, etc.
     WebViewPolicyDelegate* policyDelegate =
             [[WebViewPolicyDelegate alloc] initWithWxWindow: this];
 
     [m_webView setPolicyDelegate:policyDelegate];
+    
+    m_policyDelegate = policyDelegate;
 
     WebViewUIDelegate* uiDelegate =
             [[WebViewUIDelegate alloc] initWithWxWindow: this];
 
     [m_webView setUIDelegate:uiDelegate];
+    
+    m_UIDelegate = uiDelegate;
 #endif
     //Register our own class for custom scheme handling
     [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
@@ -160,21 +166,13 @@ wxWebViewWebKit::~wxWebViewWebKit()
 {
 #if wxOSX_USE_IPHONE
 #else
-    WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
-    WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];
-    WebViewUIDelegate* uiDelegate = [m_webView UIDelegate];
     [m_webView setFrameLoadDelegate: nil];
     [m_webView setPolicyDelegate: nil];
     [m_webView setUIDelegate: nil];
 
-    if (loadDelegate)
-        [loadDelegate release];
-
-    if (policyDelegate)
-        [policyDelegate release];
-
-    if (uiDelegate)
-        [uiDelegate release];
+    [m_loadDelegate release];
+    [m_policyDelegate release];
+    [m_UIDelegate release];
 #endif
 }
 
@@ -1033,8 +1031,16 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
     wxString wxpath = wxCFStringRef::AsString(path);
     wxString scheme = wxCFStringRef::AsString([[request URL] scheme]);
+    
+    // since canInitRequest has already checked whether this scheme is supported
+    // the hash map contains this entry, but to satisfy static code analysis
+    // suspecting nullptr dereference ...
+#ifndef __clang_analyzer__
     wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
-
+#else
+    wxFSFile* file = NULL;
+#endif
+    
     if (!file)
     {
         NSError *error = [[NSError alloc] initWithDomain:NSURLErrorDomain
@@ -1042,6 +1048,8 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                             userInfo:nil];
 
         [client URLProtocol:self didFailWithError:error];
+        
+        [error release];
 
         return;
     }
@@ -1069,6 +1077,8 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     //Notify that we have finished
     [client URLProtocolDidFinishLoading:self];
 
+    [data release];
+    
     [response release];
 }
 
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index fa6349c560..a069d652b7 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1701,10 +1701,9 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         GetPeer()->ScrollRect( &scrollrect, dx, dy );
     }
 
-    wxWindowMac *child;
-    int x, y, w, h;
     for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
+        wxWindowMac* child;
         child = node->GetData();
         if (child == NULL)
             continue;
@@ -1715,6 +1714,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         if ( !IsClientAreaChild(child) )
             continue;
 
+        int x, y, w, h;
         child->GetPosition( &x, &y );
         child->GetSize( &w, &h );
         if (rect)
@@ -2003,10 +2003,10 @@ void wxWindowMac::MacPaintChildrenBorders()
     // in Composited windowing
     wxPoint clientOrigin = GetClientAreaOrigin() ;
 
-    wxWindowMac *child;
     int x, y, w, h;
     for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
+        wxWindowMac* child;
         child = node->GetData();
         if (child == NULL)
             continue;
@@ -2052,69 +2052,18 @@ bool wxWindowMac::MacHasScrollBarCorner() const
 {
 #if wxUSE_SCROLLBAR && !wxOSX_USE_IPHONE
     /* Returns whether the scroll bars in a wxScrolledWindow should be
-     * shortened. Scroll bars should be shortened if either:
-     *
-     * - both scroll bars are visible, or
-     *
-     * - there is a resize box in the parent frame's corner and this
-     *   window shares the bottom and right edge with the parent
-     *   frame.
+     * shortened, which happens only when both scroll bars are visible.
      */
 
-    if ( m_hScrollBar == NULL && m_vScrollBar == NULL )
-        return false;
-
     if ( ( m_hScrollBar && m_hScrollBar->IsShown() )
          && ( m_vScrollBar && m_vScrollBar->IsShown() ) )
     {
         // Both scroll bars visible
         return true;
     }
-    else
-    {
-        wxPoint thisWindowBottomRight = GetScreenRect().GetBottomRight();
-
-        for ( const wxWindow *win = (wxWindow*)this; win; win = win->GetParent() )
-        {
-            const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
-            if ( frame )
-            {
-                // starting from 10.7 there are no resize indicators anymore
-                if ( (frame->GetWindowStyleFlag() & wxRESIZE_BORDER) && !wxPlatformInfo::Get().CheckOSVersion(10, 7) )
-                {
-                    // Parent frame has resize handle
-                    wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
-
-                    // Note: allow for some wiggle room here as wxMac's
-                    // window rect calculations seem to be imprecise
-                    if ( abs( thisWindowBottomRight.x - frameBottomRight.x ) <= 2
-                        && abs( thisWindowBottomRight.y - frameBottomRight.y ) <= 2 )
-                    {
-                        // Parent frame has resize handle and shares
-                        // right bottom corner
-                        return true ;
-                    }
-                    else
-                    {
-                        // Parent frame has resize handle but doesn't
-                        // share right bottom corner
-                        return false ;
-                    }
-                }
-                else
-                {
-                    // Parent frame doesn't have resize handle
-                    return false ;
-                }
-            }
-        }
-
-        // No parent frame found
-        return false ;
-    }
-#else
-    return false;
 #endif
+
+    return false;
 }
 
 void wxWindowMac::MacCreateScrollBars( long style )
@@ -2230,10 +2179,10 @@ void wxWindowMac::MacSuperChangedPosition()
 
     m_cachedClippedRectValid = false ;
 
-    wxWindowMac *child;
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
+        wxWindowMac* child;
         child = node->GetData();
         child->MacSuperChangedPosition() ;
 
@@ -2245,10 +2194,10 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 
-    wxWindowMac *child;
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
+        wxWindowMac* child;
         child = node->GetData();
         child->MacTopLevelWindowChangedPosition() ;
 
diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 5a9af11668..852d91790f 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -263,9 +263,6 @@ wxPGWindowList wxPGSpinCtrlEditor::CreateControls( wxPropertyGrid* propgrid, wxP
                                                    const wxPoint& pos, const wxSize& sz ) const
 {
     const int margin = 1;
-    wxSize butSz(18, sz.y);
-    wxSize tcSz(sz.x - butSz.x - margin, sz.y);
-    wxPoint butPos(pos.x + tcSz.x + margin, pos.y);
 
     wxSpinButton* wnd2;
 
@@ -283,8 +280,18 @@ wxPGWindowList wxPGSpinCtrlEditor::CreateControls( wxPropertyGrid* propgrid, wxP
 #ifdef __WXMSW__
     wnd2->Hide();
 #endif
-    wnd2->Create( propgrid->GetPanel(), wxID_ANY, butPos, butSz, wxSP_VERTICAL );
-
+    wnd2->Create( propgrid->GetPanel(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_VERTICAL );
+    // Scale spin button to the required height (row height)
+    wxSize butSz = wnd2->GetBestSize();
+#ifdef __WXGTK3__
+    // Under GTK+ 3 spin button is always horizontal and cannot be downscaled
+    int butWidth = butSz.x;
+#else
+    double sc = (double)sz.y / butSz.y;
+    int butWidth = wxMax(18, wxRound(sc*butSz.x));
+#endif
+    wxSize tcSz(sz.x - butWidth - margin, sz.y);
+    wnd2->SetSize(pos.x + tcSz.x + margin, pos.y, butWidth, sz.y);
     wnd2->SetRange( INT_MIN, INT_MAX );
     wnd2->SetValue( 0 );
 
@@ -303,13 +310,12 @@ bool wxPGSpinCtrlEditor::OnEvent( wxPropertyGrid* propgrid, wxPGProperty* proper
                                   wxWindow* wnd, wxEvent& event ) const
 {
     wxEventType evtType = event.GetEventType();
-    int keycode = -1;
-    int spins = 1;
     bool bigStep = false;
 
     if ( evtType == wxEVT_KEY_DOWN )
     {
         wxKeyEvent& keyEvent = (wxKeyEvent&)event;
+        int keycode;
         keycode = keyEvent.GetKeyCode();
 
         if ( keycode == WXK_UP )
@@ -330,6 +336,7 @@ bool wxPGSpinCtrlEditor::OnEvent( wxPropertyGrid* propgrid, wxPGProperty* proper
 
     if ( evtType == wxEVT_SCROLL_LINEUP || evtType == wxEVT_SCROLL_LINEDOWN )
     {
+        int spins = 1;
     #if IS_MOTION_SPIN_SUPPORTED
         if ( property->GetAttributeAsLong(wxPG_ATTR_SPINCTRL_MOTION, 0) )
         {
@@ -374,14 +381,8 @@ bool wxPGSpinCtrlEditor::OnEvent( wxPropertyGrid* propgrid, wxPGProperty* proper
                 // Min/Max check
                 wxFloatProperty::DoValidation(property, v_d, NULL, mode);
 
-                int precision = -1;
-                wxVariant v = property->GetAttribute(wxPG_FLOAT_PRECISION);
-                if ( !v.IsNull() )
-                {
-                    precision = v.GetInteger();
-                }
-
-                s = wxNumberFormatter::ToString(v_d, precision, wxNumberFormatter::Style_NoTrailingZeroes);
+                wxVariant v(v_d);
+                s = property->ValueToString(v, 0);
             }
             else
             {
@@ -872,6 +873,7 @@ void wxFontProperty::OnCustomPaint(wxDC& dc,
 
 // wxEnumProperty based classes cannot use wxPG_PROP_CLASS_SPECIFIC_1
 #define wxPG_PROP_HIDE_CUSTOM_COLOUR        wxPG_PROP_CLASS_SPECIFIC_2
+#define wxPG_PROP_COLOUR_HAS_ALPHA          wxPG_PROP_CLASS_SPECIFIC_3
 
 #include "wx/colordlg.h"
 
@@ -946,10 +948,7 @@ void wxSystemColourProperty::Init( int type, const wxColour& colour )
 {
     wxColourPropertyValue cpv;
 
-    if ( colour.IsOk() )
-        cpv.Init( type, colour );
-    else
-        cpv.Init( type, *wxWHITE );
+    cpv.Init(type, colour.IsOk() ? colour : *wxWHITE);
 
     m_flags |= wxPG_PROP_STATIC_CHOICES; // Colour selection cannot be changed.
 
@@ -1181,8 +1180,7 @@ wxString wxSystemColourProperty::ColourToString( const wxColour& col,
     if ( index == wxNOT_FOUND )
     {
 
-        if ( (argFlags & wxPG_FULL_VALUE) ||
-             GetAttributeAsLong(wxPG_COLOUR_HAS_ALPHA, 0) )
+        if ( (argFlags & wxPG_FULL_VALUE) || (m_flags & wxPG_PROP_COLOUR_HAS_ALPHA) )
         {
             return wxString::Format(wxS("(%i,%i,%i,%i)"),
                                     (int)col.Red(),
@@ -1262,7 +1260,7 @@ bool wxSystemColourProperty::QueryColourFromUser( wxVariant& variant ) const
 
     wxColourData data;
     data.SetChooseFull(true);
-    data.SetChooseAlpha(GetAttributeAsLong(wxPG_COLOUR_HAS_ALPHA, 0) != 0);
+    data.SetChooseAlpha((m_flags & wxPG_PROP_COLOUR_HAS_ALPHA) != 0);
     data.SetColour(val.m_colour);
     for ( int i = 0; i < wxColourData::NUM_CUSTOM; i++ )
     {
@@ -1573,16 +1571,16 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
 {
     if ( name == wxPG_COLOUR_ALLOW_CUSTOM )
     {
-        int ival = value.GetLong();
+        bool allow = value.GetBool();
 
-        if ( ival && (m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
+        if ( allow && (m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
         {
             // Show custom choice
             /* TRANSLATORS: Custom colour choice entry */
             m_choices.Add(_("Custom"), wxPG_COLOUR_CUSTOM);
             m_flags &= ~(wxPG_PROP_HIDE_CUSTOM_COLOUR);
         }
-        else if ( !ival && !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
+        else if ( !allow && !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
         {
             // Hide custom choice
             m_choices.RemoveAt(GetCustomColourIndex());
@@ -1590,7 +1588,12 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
         }
         return true;
     }
-    return false;
+    else if ( name == wxPG_COLOUR_HAS_ALPHA )
+    {
+        ChangeFlag(wxPG_PROP_COLOUR_HAS_ALPHA, value.GetBool());
+        return true;
+    }
+    return wxEnumProperty::DoSetAttribute(name, value);
 }
 
 
@@ -1943,7 +1946,7 @@ wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString&
     const wxString& value )
     : wxFileProperty(label,name,value)
 {
-    SetAttribute( wxPG_FILE_WILDCARD, wxPGGetDefaultImageWildcard() );
+    m_wildcard = wxPGGetDefaultImageWildcard();
 
     m_pImage = NULL;
     m_pBitmap = NULL;
@@ -2031,6 +2034,7 @@ wxMultiChoiceProperty::wxMultiChoiceProperty( const wxString& label,
                                               const wxArrayString& value)
                                                 : wxPGProperty(label,name)
 {
+    m_userStringMode = 0;
     m_choices.Assign(choices);
     SetValue(value);
 }
@@ -2041,6 +2045,7 @@ wxMultiChoiceProperty::wxMultiChoiceProperty( const wxString& label,
                                               const wxArrayString& value)
                                                 : wxPGProperty(label,name)
 {
+    m_userStringMode = 0;
     m_choices.Set(strings);
     SetValue(value);
 }
@@ -2050,6 +2055,7 @@ wxMultiChoiceProperty::wxMultiChoiceProperty( const wxString& label,
                                               const wxArrayString& value)
                                                 : wxPGProperty(label,name)
 {
+    m_userStringMode = 0;
     wxArrayString strings;
     m_choices.Set(strings);
     SetValue(value);
@@ -2163,8 +2169,6 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
 
         if ( dlg.ShowModal() == wxID_OK && choiceCount )
         {
-            int userStringMode = GetAttributeAsLong(wxS("UserStringMode"), 0);
-
             wxArrayInt arrInt = dlg.GetSelections();
 
             wxVariant variant;
@@ -2175,7 +2179,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
             // Translate string indices to strings
 
             unsigned int n;
-            if ( userStringMode == 1 )
+            if ( m_userStringMode == 1 )
             {
                 for (n=0;n<extraStrings.size();n++)
                     value.push_back(extraStrings[n]);
@@ -2184,7 +2188,7 @@ bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
             for ( size_t i = 0; i < arrInt.size(); i++ )
                 value.Add(m_choices.GetLabel(arrInt.Item(i)));
 
-            if ( userStringMode == 2 )
+            if ( m_userStringMode == 2 )
             {
                 for (n=0;n<extraStrings.size();n++)
                     value.push_back(extraStrings[n]);
@@ -2204,10 +2208,8 @@ bool wxMultiChoiceProperty::StringToValue( wxVariant& variant, const wxString& t
 {
     wxArrayString arr;
 
-    int userStringMode = GetAttributeAsLong(wxS("UserStringMode"), 0);
-
     WX_PG_TOKENIZER2_BEGIN(text,wxT('"'))
-        if ( userStringMode > 0 || (m_choices.IsOk() && m_choices.Index( token ) != wxNOT_FOUND) )
+        if ( m_userStringMode > 0 || (m_choices.IsOk() && m_choices.Index( token ) != wxNOT_FOUND) )
             arr.Add(token);
     WX_PG_TOKENIZER2_END()
 
@@ -2217,6 +2219,16 @@ bool wxMultiChoiceProperty::StringToValue( wxVariant& variant, const wxString& t
     return true;
 }
 
+bool wxMultiChoiceProperty::DoSetAttribute( const wxString& name, wxVariant& value )
+{
+    if ( name == wxPG_ATTR_MULTICHOICE_USERSTRINGMODE )
+    {
+        m_userStringMode = (int)value.GetLong();
+        return true;
+    }
+    return wxPGProperty::DoSetAttribute(name, value);
+}
+
 #endif // wxUSE_CHOICEDLG
 
 
@@ -2350,7 +2362,7 @@ bool wxDateProperty::DoSetAttribute( const wxString& name, wxVariant& value )
         ms_defaultDateFormat.clear();  // This may need recalculation
         return true;
     }
-    return false;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 #endif  // wxUSE_DATETIME
diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index f4a954495a..5418c64711 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -520,12 +520,9 @@ class wxPGDoubleClickProcessor : public wxEvtHandler
 {
 public:
 
-    wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxPGProperty* property )
+    wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxBoolProperty* property )
         : wxEvtHandler()
     {
-        wxASSERT_MSG( wxDynamicCast(property, wxBoolProperty),
-           wxS("Double-click processor should be used only with wxBoolProperty") );
-
         m_timeLastMouseUp = 0;
         m_combo = combo;
         m_property = property;
@@ -589,7 +586,7 @@ protected:
 private:
     wxMilliClock_t              m_timeLastMouseUp;
     wxOwnerDrawnComboBox*       m_combo;
-    wxPGProperty*               m_property;  // Selected property
+    wxBoolProperty*             m_property;  // Selected property
     bool                        m_downReceived;
 
     wxDECLARE_EVENT_TABLE();
@@ -610,7 +607,6 @@ public:
         : wxOwnerDrawnComboBox()
     {
         m_dclickProcessor = NULL;
-        m_sizeEventCalled = false;
     }
 
     ~wxPGComboBox()
@@ -647,9 +643,10 @@ public:
         // only for wxBoolProperty.
         m_selProp = GetGrid()->GetSelection();
         wxASSERT(m_selProp);
-        if (wxDynamicCast(m_selProp, wxBoolProperty))
+        wxBoolProperty* boolProp = wxDynamicCast(m_selProp, wxBoolProperty);
+        if ( boolProp )
         {
-            m_dclickProcessor = new wxPGDoubleClickProcessor(this, m_selProp);
+            m_dclickProcessor = new wxPGDoubleClickProcessor(this, boolProp);
             PushEventHandler(m_dclickProcessor);
         }
 
@@ -734,7 +731,6 @@ public:
 
 private:
     wxPGDoubleClickProcessor*   m_dclickProcessor;
-    bool                        m_sizeEventCalled;
     wxPGProperty*               m_selProp;
 };
 
@@ -781,7 +777,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
 
     const wxBitmap* itemBitmap = NULL;
 
-    if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 )
+    if ( choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 )
         itemBitmap = &choices.Item(item).GetBitmap();
 
     //
@@ -853,7 +849,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
         // image will not appear on the control row (it may be too
         // large to fit, for instance). Also do not draw custom image
         // if no choice was selected.
-        if ( !p->HasFlag(wxPG_PROP_CUSTOMIMAGE) || item < 0 )
+        if ( !p->HasFlag(wxPG_PROP_CUSTOMIMAGE) )
             useCustomPaintProcedure = false;
     }
     else
@@ -897,13 +893,9 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
             renderer->Render( dc, r, this, p, m_selColumn, comValIndex, renderFlags );
             return;
         }
-        else if ( item >= 0 )
-        {
-            p->OnCustomPaint( dc, r, paintdata );
-        }
         else
         {
-            dc.DrawRectangle( r );
+            p->OnCustomPaint( dc, r, paintdata );
         }
 
         pt.x += paintdata.m_drawnWidth + wxCC_CUSTOM_IMAGE_MARGIN2 - 1;
@@ -915,10 +907,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
         //       sure if it is needed, but seems to not cause any harm.
         pt.x -= 1;
 
-        if ( item < 0 && (flags & wxODCB_PAINTING_CONTROL) )
-            item = pCb->GetSelection();
-
-        if ( choices.IsOk() && item >= 0 && comValIndex < 0 )
+        if ( choices.IsOk() && comValIndex < 0 )
         {
             // This aligns bitmap horizontally so that it is
             // on the same position as bitmap drawn for static content
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index fa5b37792a..06113fc036 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -239,6 +239,10 @@ public:
         // Seed titles with defaults
         m_columns[0]->SetTitle(_("Property"));
         m_columns[1]->SetTitle(_("Value"));
+
+        Bind(wxEVT_HEADER_RESIZING, &wxPGHeaderCtrl::OnResizing, this);
+        Bind(wxEVT_HEADER_BEGIN_RESIZE, &wxPGHeaderCtrl::OnBeginResize, this);
+        Bind(wxEVT_HEADER_END_RESIZE, &wxPGHeaderCtrl::OnEndResize, this);
     }
 
     virtual ~wxPGHeaderCtrl()
@@ -250,19 +254,18 @@ public:
         }
     }
 
+    virtual void OnColumnCountChanging(unsigned int count) wxOVERRIDE
+    {
+        EnsureColumnCount(count);
+    }
+
     void OnPageChanged(const wxPropertyGridPage* page)
     {
         m_page = page;
-        OnPageUpdated();
-    }
-
-    void OnPageUpdated()
-    {
         // Get column info from the page
         unsigned int colCount = m_page->GetColumnCount();
-        EnsureColumnCount(colCount);
-        DetermineAllColumnWidths();
         SetColumnCount(colCount);
+        DetermineAllColumnWidths();
     }
 
     void OnColumWidthsChanged()
@@ -301,11 +304,8 @@ private:
     {
         wxPropertyGrid* pg = m_manager->GetGrid();
 
-        int sbWidth = pg->HasScrollbar(wxSB_VERTICAL)
-                        ? wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, pg)
-                        : 0;
         // Internal border width
-        int borderWidth = (pg->GetSize().x - pg->GetClientSize().x - sbWidth) / 2;
+        int borderWidth = pg->DoGetBorderSize().x / 2;
 
         const unsigned int colCount = m_page->GetColumnCount();
         for ( unsigned int i = 0; i < colCount; i++ )
@@ -340,11 +340,8 @@ private:
     {
         wxPropertyGrid* pg = m_manager->GetGrid();
 
-        int sbWidth = pg->HasScrollbar(wxSB_VERTICAL)
-                        ? wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, pg)
-                        : 0;
         // Internal border width
-        int borderWidth = (pg->GetSize().x - pg->GetClientSize().x - sbWidth) / 2;
+        int borderWidth = pg->DoGetBorderSize().x / 2;
 
         // Compensate for the internal border
         int x = -borderWidth;
@@ -359,55 +356,45 @@ private:
                                   wxPG_SPLITTER_FROM_EVENT);
     }
 
-    virtual bool ProcessEvent( wxEvent& event ) wxOVERRIDE
+    void OnResizing(wxHeaderCtrlEvent& evt)
     {
-        wxHeaderCtrlEvent* hcEvent = wxDynamicCast(&event, wxHeaderCtrlEvent);
-        if ( hcEvent )
-        {
-            wxPropertyGrid* pg = m_manager->GetGrid();
-            int col = hcEvent->GetColumn();
-            wxEventType evtType = event.GetEventType();
+        int col = evt.GetColumn();
+        int colWidth = evt.GetWidth();
 
-            if ( evtType == wxEVT_HEADER_RESIZING )
-            {
-                int colWidth = hcEvent->GetWidth();
+        OnSetColumnWidth(col, colWidth);
+        OnColumWidthsChanged();
 
-                OnSetColumnWidth(col, colWidth);
+        wxPropertyGrid* pg = m_manager->GetGrid();
+        pg->SendEvent(wxEVT_PG_COL_DRAGGING, NULL, NULL, 0,
+                      (unsigned int)col);
+    }
 
-                pg->SendEvent(wxEVT_PG_COL_DRAGGING,
-                              NULL, NULL, 0,
-                              (unsigned int)col);
+    void OnBeginResize(wxHeaderCtrlEvent& evt)
+    {
+        int col = evt.GetColumn();
+        wxPropertyGrid* pg = m_manager->GetGrid();
 
-                return true;
-            }
-            else if ( evtType == wxEVT_HEADER_BEGIN_RESIZE )
-            {
-                // Don't allow resizing the rightmost column
-                // (like it's not allowed for the rightmost wxPropertyGrid splitter)
-                if ( col == (int)m_page->GetColumnCount() - 1 )
-                    hcEvent->Veto();
-                // Never allow column resize if layout is static
-                else if ( m_manager->HasFlag(wxPG_STATIC_SPLITTER) )
-                    hcEvent->Veto();
-                // Allow application to veto dragging
-                else if ( pg->SendEvent(wxEVT_PG_COL_BEGIN_DRAG,
-                                        NULL, NULL, 0,
-                                        (unsigned int)col) )
-                    hcEvent->Veto();
+        // Don't allow resizing the rightmost column
+        // (like it's not allowed for the rightmost wxPropertyGrid splitter)
+        if ( col == (int)m_page->GetColumnCount() - 1 )
+            evt.Veto();
+        // Never allow column resize if layout is static
+        else if ( m_manager->HasFlag(wxPG_STATIC_SPLITTER) )
+            evt.Veto();
+        // Allow application to veto dragging
+        else if ( pg->SendEvent(wxEVT_PG_COL_BEGIN_DRAG,
+                                NULL, NULL, 0,
+                                (unsigned int)col) )
+            evt.Veto();
+    }
 
-                return true;
-            }
-            else if ( evtType == wxEVT_HEADER_END_RESIZE )
-            {
-                pg->SendEvent(wxEVT_PG_COL_END_DRAG,
-                              NULL, NULL, 0,
-                              (unsigned int)col);
-
-                return true;
-            }
-        }
-
-        return wxHeaderCtrl::ProcessEvent(event);
+    void OnEndResize(wxHeaderCtrlEvent& evt)
+    {
+        int col = evt.GetColumn();
+        wxPropertyGrid* pg = m_manager->GetGrid();
+        pg->SendEvent(wxEVT_PG_COL_END_DRAG,
+                      NULL, NULL, 0,
+                      (unsigned int)col);
     }
 
     wxPropertyGridManager*          m_manager;
@@ -933,13 +920,23 @@ void wxPropertyGridManager::SetColumnCount( int colCount, int page )
     wxASSERT( page >= -1 );
     wxASSERT( page < (int)GetPageCount() );
 
-    GetPageState(page)->SetColumnCount( colCount );
-    GetGrid()->Refresh();
-
+    wxPropertyGridPageState* state = GetPageState(page);
 #if wxUSE_HEADERCTRL
-    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
-        m_pHeaderCtrl->OnPageUpdated();
-#endif
+    // Update header only if column count is set for the currently visible page
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() && state == m_pState )
+    {
+        m_pHeaderCtrl->SetColumnCount(colCount);
+    }
+#endif // wxUSE_HEADERCTRL
+    state->SetColumnCount( colCount );
+    GetGrid()->Refresh();
+#if wxUSE_HEADERCTRL
+    // Update header only if column count is set for the currently visible page
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() && state == m_pState )
+    {
+        m_pHeaderCtrl->OnColumWidthsChanged();
+    }
+#endif // wxUSE_HEADERCTRL
 }
 // -----------------------------------------------------------------------
 
@@ -1359,6 +1356,10 @@ void wxPropertyGridManager::RecalculatePositions( int width, int height )
     if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
     {
         m_pHeaderCtrl->SetSize(0, propgridY, width, wxDefaultCoord);
+        // Sync horizontal scroll position with grid
+        int x;
+        m_pPropGrid->CalcScrolledPosition(0, 0, &x, NULL);
+        m_pHeaderCtrl->ScrollWindow(x, 0);
         propgridY += m_pHeaderCtrl->GetSize().y;
     }
 #endif
@@ -1939,18 +1940,16 @@ void wxPropertyGridManager::ReconnectEventHandlers(wxWindowID oldId, wxWindowID
     {
         Unbind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this,
                oldId);
-        Unbind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this,
-               oldId);
         Unbind(wxEVT_PG_HSCROLL, &wxPropertyGridManager::OnPGScrollH, this, oldId);
+        Unbind(wxEVT_PG_COLS_RESIZED, &wxPropertyGridManager::OnColWidthsChanged, this, oldId);
     }
 
     if (newId != wxID_NONE)
     {
         Bind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this,
              newId);
-        Bind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this,
-             newId);
         Bind(wxEVT_PG_HSCROLL, &wxPropertyGridManager::OnPGScrollH, this, newId);
+        Bind(wxEVT_PG_COLS_RESIZED, &wxPropertyGridManager::OnColWidthsChanged, this, newId);
     }
 }
 
@@ -1968,15 +1967,6 @@ void wxPropertyGridManager::OnPropertyGridSelect( wxPropertyGridEvent& event )
 
 // -----------------------------------------------------------------------
 
-void
-wxPropertyGridManager::OnPGColDrag( wxPropertyGridEvent& WXUNUSED(event) )
-{
-#if wxUSE_HEADERCTRL
-    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
-        m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-}
-
 void wxPropertyGridManager::OnPGScrollH(wxPropertyGridEvent& evt)
 {
 #if wxUSE_HEADERCTRL
@@ -1987,6 +1977,14 @@ void wxPropertyGridManager::OnPGScrollH(wxPropertyGridEvent& evt)
 #endif // wxUSE_HEADERCTRL
 }
 
+void wxPropertyGridManager::OnColWidthsChanged(wxPropertyGridEvent& WXUNUSED(evt))
+{
+#if wxUSE_HEADERCTRL
+    if ( m_pHeaderCtrl )
+        m_pHeaderCtrl->OnColumWidthsChanged();
+#endif
+}
+
 // -----------------------------------------------------------------------
 
 void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) )
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 700eef79ac..8d0a9720fd 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -1627,10 +1627,7 @@ void wxPGProperty::Enable( bool enable )
 
 void wxPGProperty::DoEnable( bool enable )
 {
-    if ( enable )
-        ClearFlag(wxPG_PROP_DISABLED);
-    else
-        SetFlag(wxPG_PROP_DISABLED);
+    ChangeFlag(wxPG_PROP_DISABLED, !enable);
 
     // Apply same to sub-properties as well
     for ( unsigned int i = 0; i < GetChildCount(); i++ )
@@ -1855,14 +1852,19 @@ bool wxPGProperty::DoSetAttribute( const wxString& WXUNUSED(name), wxVariant& WX
 
 void wxPGProperty::SetAttribute( const wxString& name, wxVariant value )
 {
-    if ( DoSetAttribute( name, value ) )
+    if ( !DoSetAttribute(name, value) || !wxPGGlobalVars->HasExtraStyle(wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES) )
     {
-        // Support working without grid, when possible
-        if ( wxPGGlobalVars->HasExtraStyle( wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES ) )
-            return;
+        m_attributes.Set(name, value);
+    }
+    // Because changing some attributes (like wxPG_FLOAT_PRECISION, wxPG_UINT_BASE,
+    // wxPG_UINT_PREFIX, wxPG_ATTR_UNITS) affect displayed form of the property value
+    // so we have to redraw property to be sure that displayed value is in sync
+    // with current attributes.
+    wxPropertyGrid* pg = GetGridIfDisplayed();
+    if ( pg )
+    {
+        pg->RefreshProperty(this);
     }
-
-    m_attributes.Set( name, value );
 }
 
 void wxPGProperty::SetAttributes( const wxPGAttributeStorage& attributes )
@@ -2149,10 +2151,7 @@ bool wxPGProperty::Hide( bool hide, int flags )
 
 bool wxPGProperty::DoHide( bool hide, int flags )
 {
-    if ( !hide )
-        ClearFlag( wxPG_PROP_HIDDEN );
-    else
-        SetFlag( wxPG_PROP_HIDDEN );
+    ChangeFlag(wxPG_PROP_HIDDEN, hide);
 
     if ( flags & wxPG_RECURSE )
     {
@@ -2549,7 +2548,6 @@ int wxPGProperty::GetChildrenHeight( int lh, int iMax_ ) const
     //
     // iMax is used when finding property y-positions.
     //
-    unsigned int i = 0;
     int h = 0;
 
     if ( iMax_ == -1 )
@@ -2562,9 +2560,9 @@ int wxPGProperty::GetChildrenHeight( int lh, int iMax_ ) const
     if ( !IsExpanded() && GetParent() )
         return 0;
 
-    while ( i < iMax )
+    for ( unsigned int i = 0; i < iMax; i++ )
     {
-        wxPGProperty* pwc = (wxPGProperty*) Item(i);
+        wxPGProperty* pwc = Item(i);
 
         if ( !pwc->HasFlag(wxPG_PROP_HIDDEN) )
         {
@@ -2574,8 +2572,6 @@ int wxPGProperty::GetChildrenHeight( int lh, int iMax_ ) const
             else
                 h += pwc->GetChildrenHeight(lh) + lh;
         }
-
-        i++;
     }
 
     return h;
@@ -2593,10 +2589,8 @@ wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y,
     wxPGProperty* result = NULL;
     wxPGProperty* current = NULL;
     unsigned int iy = *nextItemY;
-    unsigned int i = 0;
-    unsigned int iMax = GetChildCount();
 
-    while ( i < iMax )
+    for ( unsigned int i = 0; i < GetChildCount(); i++ )
     {
         wxPGProperty* pwc = Item(i);
 
@@ -2614,15 +2608,13 @@ wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y,
             if ( pwc->IsExpanded() &&
                  pwc->GetChildCount() > 0 )
             {
-                result = (wxPGProperty*) pwc->GetItemAtY( y, lh, &iy );
+                result = pwc->GetItemAtY( y, lh, &iy );
                 if ( result )
                     break;
             }
 
             current = pwc;
         }
-
-        i++;
     }
 
     // Found?
@@ -2642,7 +2634,7 @@ wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y,
     }
     */
 
-    return (wxPGProperty*) result;
+    return result;
 }
 
 void wxPGProperty::Empty()
@@ -2832,6 +2824,54 @@ void wxPGProperty::SubPropsChanged( int oldSelInd )
     }
 }
 
+wxString wxPGProperty::GetHintText() const
+{
+    wxVariant vHintText = GetAttribute(wxPG_ATTR_HINT);
+
+#if wxPG_COMPATIBILITY_1_4
+    // Try the old, deprecated "InlineHelp"
+    if ( vHintText.IsNull() )
+        vHintText = GetAttribute(wxPG_ATTR_INLINE_HELP);
+#endif
+
+    if ( !vHintText.IsNull() )
+        return vHintText.GetString();
+
+    return wxEmptyString;
+}
+
+int wxPGProperty::GetDisplayedCommonValueCount() const
+{
+    if ( HasFlag(wxPG_PROP_USES_COMMON_VALUE) )
+    {
+        wxPropertyGrid* pg = GetGrid();
+        if ( pg )
+            return (int)pg->GetCommonValueCount();
+    }
+    return 0;
+}
+
+void wxPGProperty::SetDefaultValue(wxVariant& value)
+{
+    SetAttribute(wxPG_ATTR_DEFAULT_VALUE, value);
+}
+
+void wxPGProperty::SetEditor(const wxString& editorName)
+{
+    m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName);
+}
+
+bool wxPGProperty::SetMaxLength(int maxLen)
+{
+    const wxPGEditor* editorClass = GetEditorClass();
+    if ( editorClass != wxPGEditor_TextCtrl &&
+         editorClass != wxPGEditor_TextCtrlAndButton )
+        return false;
+
+    m_maxLen = wxMax(maxLen, 0); // shouldn't be a nagative value
+    return true;
+}
+
 // -----------------------------------------------------------------------
 // wxPGRootProperty
 // -----------------------------------------------------------------------
@@ -3203,19 +3243,48 @@ void wxPGChoices::Free()
 // wxPGAttributeStorage
 // -----------------------------------------------------------------------
 
+static inline void IncDataRef(wxPGHashMapS2P& map)
+{
+    wxPGHashMapS2P::iterator it;
+    for ( it = map.begin(); it != map.end(); ++it )
+    {
+        static_cast<wxVariantData*>(it->second)->IncRef();
+    }
+}
+
+static inline void DecDataRef(wxPGHashMapS2P& map)
+{
+    wxPGHashMapS2P::iterator it;
+    for ( it = map.begin(); it != map.end(); ++it )
+    {
+        static_cast<wxVariantData*>(it->second)->DecRef();
+    }
+}
+
 wxPGAttributeStorage::wxPGAttributeStorage()
 {
 }
 
+wxPGAttributeStorage::wxPGAttributeStorage(const wxPGAttributeStorage& other)
+{
+    m_map = other.m_map;
+    IncDataRef(m_map);
+}
+
 wxPGAttributeStorage::~wxPGAttributeStorage()
 {
-    wxPGHashMapS2P::iterator it;
+    DecDataRef(m_map);
+}
 
-    for ( it = m_map.begin(); it != m_map.end(); ++it )
+wxPGAttributeStorage& wxPGAttributeStorage::operator=(const wxPGAttributeStorage& rhs)
+{
+    if ( this != &rhs )
     {
-        wxVariantData* data = (wxVariantData*) it->second;
-        data->DecRef();
+        DecDataRef(m_map);
+        m_map = rhs.m_map;
+        IncDataRef(m_map);
     }
+    return *this;
 }
 
 void wxPGAttributeStorage::Set( const wxString& name, const wxVariant& value )
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 01b8759733..e8d6ba5edf 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -185,8 +185,8 @@ wxPGGlobalVarsClass* wxPGGlobalVars = NULL;
 wxPGGlobalVarsClass::wxPGGlobalVarsClass()
     // Prepare some shared variants
     : m_vEmptyString(wxString())
-    , m_vZero((long)0)
-    , m_vMinusOne((long)-1)
+    , m_vZero(0L)
+    , m_vMinusOne(-1L)
     , m_vTrue(true)
     , m_vFalse(false)
     // Prepare cached string constants
@@ -287,7 +287,7 @@ wxEND_EVENT_TABLE()
 // -----------------------------------------------------------------------
 
 wxPropertyGrid::wxPropertyGrid()
-    : wxControl(), wxScrollHelper(this)
+    : wxScrolled<wxControl>()
 {
     Init1();
 }
@@ -300,7 +300,7 @@ wxPropertyGrid::wxPropertyGrid( wxWindow *parent,
                                 const wxSize& size,
                                 long style,
                                 const wxString& name )
-    : wxControl(), wxScrollHelper(this)
+    : wxScrolled<wxControl>()
 {
     Init1();
     Create(parent,id,pos,size,style,name);
@@ -494,13 +494,14 @@ void wxPropertyGrid::Init2()
     m_tlpClosedTime = 0;
 
     // set virtual size to this window size
-    wxSize wndsize = GetSize();
-    SetVirtualSize(wndsize.GetWidth(), wndsize.GetWidth());
+    wxSize clientSize = GetClientSize();
+    SetVirtualSize(clientSize);
 
     m_timeCreated = ::wxGetLocalTimeMillis();
 
     m_iFlags |= wxPG_FL_INITIALIZED;
 
+    wxSize wndsize = GetSize();
     m_ncWidth = wndsize.GetWidth();
 
     // Need to call OnResize handler or size given in constructor/Create
@@ -1295,7 +1296,7 @@ void wxPropertyGrid::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
 {
     int oldX;
     CalcUnscrolledPosition(0, 0, &oldX, NULL);
-    wxScrollHelper::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY,
+    wxScrolled<wxControl>::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY,
                                   noUnitsX, noUnitsY, xPos, yPos, noRefresh);
     int newX;
     CalcUnscrolledPosition(0, 0, &newX, NULL);
@@ -1359,6 +1360,8 @@ void wxPropertyGrid::CalculateFontAndBitmapStuff( int vspacing )
     if ( m_pState )
         m_pState->CalculateFontAndBitmapStuff(vspacing);
 
+    SetScrollRate(wxPG_PIXELS_PER_UNIT, wxPG_PIXELS_PER_UNIT);
+
     if ( m_iFlags & wxPG_FL_INITIALIZED )
         RecalculateVirtualSize();
 
@@ -2013,18 +2016,13 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
         itemsRect = &tempItemsRect;
     }
 
-    int vx, vy;
-    GetViewStart(&vx, &vy);
-    vx *= wxPG_PIXELS_PER_UNIT;
-    vy *= wxPG_PIXELS_PER_UNIT;
-
     // items added check
     if ( m_pState->m_itemsAdded ) PrepareAfterItemsAdded();
 
     if ( m_pState->DoGetRoot()->GetChildCount() > 0 )
     {
-        int paintFinishY = DoDrawItems(dc, itemsRect) + 1 - vy;
-        int drawBottomY = itemsRect->y + itemsRect->height - 1 - vy;
+        int paintFinishY = DoDrawItems(dc, itemsRect) + 1;
+        int drawBottomY = itemsRect->GetBottom();
 
         // Clear area beyond last painted property
         if ( paintFinishY < drawBottomY )
@@ -2038,15 +2036,10 @@ void wxPropertyGrid::DrawItems( wxDC& dc,
     }
     else
     {
-        // itemRect is in virtual grid space
-        wxRect drawRect(itemsRect->x - vx,
-                        itemsRect->y - vy,
-                        itemsRect->width,
-                        itemsRect->height);
         // Just clear the area
         dc.SetPen(m_colEmptySpace);
         dc.SetBrush(m_colEmptySpace);
-        dc.DrawRectangle(drawRect);
+        dc.DrawRectangle(*itemsRect);
     }
 }
 
@@ -2062,33 +2055,18 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 #endif
 {
     const wxPGProperty* firstItem;
-    const wxPGProperty* lastItem;
-
     firstItem = DoGetItemAtY(itemsRect->y);
-    lastItem = DoGetItemAtY(itemsRect->y+itemsRect->height-1);
-
-    if ( !lastItem )
-        lastItem = GetLastItem( wxPG_ITERATE_VISIBLE );
-
-    int vx, vy;
-    GetViewStart(&vx, &vy);
-    vx *= wxPG_PIXELS_PER_UNIT;
-    vy *= wxPG_PIXELS_PER_UNIT;
 
     if ( IsFrozen() || m_height < 1 || firstItem == NULL )
-        return vy - 1;
+        return itemsRect->GetBottom();
 
-    wxCHECK_MSG( !m_pState->m_itemsAdded, vy - 1,
+    wxCHECK_MSG( !m_pState->m_itemsAdded, itemsRect->GetBottom(),
                  wxS("no items added") );
     wxASSERT( m_pState->DoGetRoot()->GetChildCount() );
 
     int lh = m_lineHeight;
-
-    int firstItemTopY;
-    int lastItemBottomY;
-
-    firstItemTopY = itemsRect->y;
-    lastItemBottomY = itemsRect->y + itemsRect->height - 1;
+    int firstItemTopY = itemsRect->y;
+    int lastItemBottomY = itemsRect->GetBottom();
 
     // Align y coordinates to item boundaries
     firstItemTopY -= firstItemTopY % lh;
@@ -2098,10 +2076,10 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
     // Entire range outside scrolled, visible area?
     if ( firstItemTopY >= (int)m_pState->GetVirtualHeight() ||
          lastItemBottomY <= 0 )
-        return itemsRect->y;
+        return itemsRect->GetBottom();
 
     wxCHECK_MSG( firstItemTopY < lastItemBottomY,
-                 itemsRect->y,
+                 itemsRect->GetBottom(),
                  wxS("invalid y values") );
 
     /*
@@ -2118,12 +2096,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 
     long windowStyle = m_windowStyle;
 
-    int xRelMod = vx;
-    // itemsRect conversion
-    firstItemTopY -= vy;
-    lastItemBottomY -= vy;
-
-    int x = m_marginWidth - xRelMod;
+    int x = m_marginWidth;
 
     wxFont normalFont = GetFont();
 
@@ -2152,7 +2125,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
     if ( !(windowStyle & wxPG_HIDE_MARGIN) )
     {
         dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle(-1-xRelMod,firstItemTopY-1,x+2,lastItemBottomY-firstItemTopY+2);
+        dc.DrawRectangle(-1,firstItemTopY-1,x+2,lastItemBottomY-firstItemTopY+2);
     }
 
     const wxPGProperty* firstSelected = GetSelection();
@@ -2200,7 +2173,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         splitterPos.push_back(sx);
     }
 
-    int viewLeftEdge = itemsRect->x - vx;
+    int viewLeftEdge = itemsRect->x;
     int viewRightEdge = viewLeftEdge + itemsRect->width - 1;
     // Determine columns range to be drawn
     unsigned int firstCol = 0;
@@ -2225,9 +2198,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 
         int greyDepth = m_marginWidth;
         if ( !(windowStyle & wxPG_HIDE_CATEGORIES) )
-            greyDepth = (((int)p->m_depthBgCol)-1) * m_subgroup_extramargin + m_marginWidth;
-
-        int greyDepthX = greyDepth - xRelMod;
+            greyDepth += (((int)p->m_depthBgCol)-1) * m_subgroup_extramargin;
 
         // Use basic depth if in non-categoric mode and parent is base array.
         if ( !(windowStyle & wxPG_HIDE_CATEGORIES) || p->GetParent() != m_pState->DoGetRoot() )
@@ -2238,7 +2209,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         // Paint margin area
         dc.SetBrush(marginBrush);
         dc.SetPen(marginPen);
-        dc.DrawRectangle( -xRelMod, y, greyDepth, lh );
+        dc.DrawRectangle( 0, y, greyDepth, lh );
 
         dc.SetPen( linepen );
 
@@ -2258,12 +2229,12 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
         bool suppressMarginEdge = false;
 #endif
         if (!suppressMarginEdge)
-            dc.DrawLine( greyDepthX, y, greyDepthX, y2 );
+            dc.DrawLine( greyDepth, y, greyDepth, y2 );
         else
         {
             // Blank out the margin edge
             dc.SetPen(wxPen(GetBackgroundColour()));
-            dc.DrawLine( greyDepthX, y, greyDepthX, y2 );
+            dc.DrawLine( greyDepth, y, greyDepth, y2 );
             dc.SetPen( linepen );
         }
 
@@ -2279,7 +2250,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
              nextP && nextP->IsCategory() )
             dc.SetPen(m_colCapBack);
 
-        dc.DrawLine(greyDepthX, y2 - 1, cellX, y2 - 1);
+        dc.DrawLine(greyDepth, y2 - 1, cellX, y2 - 1);
 
         //
         // Need to override row colours?
@@ -2335,7 +2306,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 
         //
         // Fill additional margin area with background colour of first cell
-        if ( greyDepthX < textMarginHere )
+        if ( greyDepth < textMarginHere )
         {
             if ( !(renderFlags & wxPGCellRenderer::DontUseCellBgCol) )
             {
@@ -2345,20 +2316,20 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
             }
             dc.SetBrush(rowBgBrush);
             dc.SetPen(rowBgCol);
-            dc.DrawRectangle(greyDepthX+1, y,
-                             textMarginHere-greyDepthX, lh-1);
+            dc.DrawRectangle(greyDepth+1, y,
+                             textMarginHere-greyDepth, lh-1);
         }
 
         bool fontChanged = false;
 
         // Expander button rectangle
-        wxRect butRect( ((p->GetDepth() - 1) * m_subgroup_extramargin) - xRelMod,
+        wxRect butRect( ((p->GetDepth() - 1) * m_subgroup_extramargin),
                         y,
                         m_marginWidth,
                         lh );
 
         // Default cell rect fill the entire row
-        wxRect cellRect(greyDepthX, y, cellX - greyDepthX, lh-1);
+        wxRect cellRect(greyDepth, y, cellX - greyDepth, lh-1);
 
         bool isCategory = p->IsCategory();
 
@@ -2413,7 +2384,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
 
             if ( ci == 0 )
             {
-                textXAdd = textMarginHere - greyDepthX;
+                textXAdd = textMarginHere - greyDepth;
                 cellRect.width = firstCellWidth;
                 cellRect.x = firstCellX;
             }
@@ -2530,7 +2501,7 @@ int wxPropertyGrid::DoDrawItems( wxDC& dc,
     dc.SetBrush(wxBrush(m_colEmptySpace));
     dc.DrawRectangle(cellX, firstItemTopY, viewRightEdge - cellX + 1, lastItemBottomY - firstItemTopY);
 
-    return y - 1  + vy;
+    return y - 1;
 }
 
 // -----------------------------------------------------------------------
@@ -2767,10 +2738,9 @@ void wxPropertyGrid::SwitchState( wxPropertyGridPageState* pNewState )
     int pgWidth = GetClientSize().x;
     if ( HasVirtualWidth() )
     {
-        int minWidth = pgWidth;
-        if ( pNewState->GetVirtualWidth() < minWidth )
+        if ( pNewState->GetVirtualWidth() < pgWidth )
         {
-            pNewState->m_width = minWidth;
+            pNewState->m_width = pgWidth;
             pNewState->CheckColumnWidths();
         }
     }
@@ -4494,13 +4464,11 @@ bool wxPropertyGrid::DoExpand( wxPGProperty* p, bool sendEvents )
 {
     wxCHECK_MSG( p, false, wxS("invalid property id") );
 
-    wxPGProperty* pwc = (wxPGProperty*)p;
-
     // Store dont-center-splitter flag 'cause we need to temporarily set it
     bool prevDontCenterSplitter = m_pState->m_dontCenterSplitter;
     m_pState->m_dontCenterSplitter = true;
 
-    bool res = m_pState->DoExpand(pwc);
+    bool res = m_pState->DoExpand(p);
 
     if ( res )
     {
@@ -4524,7 +4492,6 @@ bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags )
         return m_pState->DoHideProperty(p, hide, flags);
 
     wxArrayPGProperty selection = m_pState->m_selection;  // Must use a copy
-    int selRemoveCount = 0;
     for ( unsigned int i=0; i<selection.size(); i++ )
     {
         wxPGProperty* selected = selection[i];
@@ -4532,7 +4499,6 @@ bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags )
         {
             if ( !DoRemoveFromSelection(p, flags) )
                 return false;
-            selRemoveCount += 1;
         }
     }
 
@@ -4572,54 +4538,22 @@ void wxPropertyGrid::RecalculateVirtualSize( int forceXPos )
 
     m_iFlags |= wxPG_FL_RECALCULATING_VIRTUAL_SIZE;
 
-    int x = m_pState->GetVirtualWidth();
-    int y = m_pState->m_virtualHeight;
-
-    int width, height;
-    GetClientSize(&width,&height);
-
+    int w = m_pState->GetVirtualWidth();
+    int h = m_pState->m_virtualHeight;
     // Now adjust virtual size.
-    SetVirtualSize(x, y);
-
-    int xAmount = 0;
-    int xPos = 0;
-
-    //
-    // Adjust scrollbars
-    if ( HasVirtualWidth() )
+    SetVirtualSize(w, h);
+    if ( forceXPos != -1 )
     {
-        xAmount = x/wxPG_PIXELS_PER_UNIT;
-        xPos = GetScrollPos( wxHORIZONTAL );
+        Scroll(forceXPos, wxDefaultCoord);
     }
 
-    if ( forceXPos != -1 )
-        xPos = forceXPos;
-    // xPos too high?
-    else if ( xPos > (xAmount-(width/wxPG_PIXELS_PER_UNIT)) )
-        xPos = 0;
-
-    int yAmount = y / wxPG_PIXELS_PER_UNIT;
-    int yPos = GetScrollPos( wxVERTICAL );
-
-    SetScrollbars( wxPG_PIXELS_PER_UNIT, wxPG_PIXELS_PER_UNIT,
-                   xAmount, yAmount, xPos, yPos, true );
-
-    // This may be needed in addition to calling SetScrollbars()
-    // when class inherits from wxScrollHelper instead of
-    // actual wxScrolled<T>.
-    AdjustScrollbars();
-
     // Must re-get size now
-    GetClientSize(&width,&height);
+    GetClientSize(&m_width, &m_height);
 
     if ( !HasVirtualWidth() )
     {
-        m_pState->SetVirtualWidth(width);
+        m_pState->SetVirtualWidth(m_width);
     }
-
-    m_width = width;
-    m_height = height;
-
     m_pState->CheckColumnWidths();
 
     if ( GetSelection() )
@@ -4878,8 +4812,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
                     // On double-click, expand/collapse.
                     if ( event.ButtonDClick() && !(m_windowStyle & wxPG_HIDE_MARGIN) )
                     {
-                        wxPGProperty* pwc = (wxPGProperty*)p;
-                        if ( pwc->IsExpanded() ) DoCollapse( p, true );
+                        if ( p->IsExpanded() ) DoCollapse( p, true );
                         else DoExpand( p, true );
                     }
 
@@ -4900,6 +4833,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
                         {
                             ResetColumnSizes( true );
 
+                            SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL);
                             SendEvent(wxEVT_PG_COL_DRAGGING,
                                       m_propHover,
                                       NULL,
@@ -4969,7 +4903,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
                     if ( (y2 >= m_buttonSpacingY && y2 < (m_buttonSpacingY+m_iconHeight)) )
                     {
                         // On click on expander button, expand/collapse
-                        if ( ((wxPGProperty*)p)->IsExpanded() )
+                        if ( p->IsExpanded() )
                             DoCollapse( p, true );
                         else
                             DoExpand( p, true );
@@ -5058,6 +4992,7 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
                                       wxPG_SPLITTER_REFRESH |
                                       wxPG_SPLITTER_FROM_EVENT);
 
+                SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL);
                 SendEvent(wxEVT_PG_COL_DRAGGING,
                           m_propHover,
                           NULL,
@@ -6323,7 +6258,9 @@ wxDEFINE_EVENT( wxEVT_PG_LABEL_EDIT_ENDING, wxPropertyGridEvent );
 wxDEFINE_EVENT( wxEVT_PG_COL_BEGIN_DRAG, wxPropertyGridEvent );
 wxDEFINE_EVENT( wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
 wxDEFINE_EVENT( wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
+// Events used only internally
 wxDEFINE_EVENT( wxEVT_PG_HSCROLL, wxPropertyGridEvent);
+wxDEFINE_EVENT( wxEVT_PG_COLS_RESIZED, wxPropertyGridEvent);
 
 // -----------------------------------------------------------------------
 
diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index 04b7760101..377ac72ef6 100644
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -103,8 +103,7 @@ wxPGProperty* wxPropertyGridInterface::Append( wxPGProperty* property )
 wxPGProperty* wxPropertyGridInterface::AppendIn( wxPGPropArg id, wxPGProperty* newproperty )
 {
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-    wxPGProperty* pwc = (wxPGProperty*) p;
-    wxPGProperty* retp = m_pState->DoInsert(pwc, pwc->GetChildCount(), newproperty);
+    wxPGProperty* retp = m_pState->DoInsert(p, p->GetChildCount(), newproperty);
     return retp;
 }
 
@@ -123,7 +122,7 @@ wxPGProperty* wxPropertyGridInterface::Insert( wxPGPropArg id, wxPGProperty* pro
 wxPGProperty* wxPropertyGridInterface::Insert( wxPGPropArg id, int index, wxPGProperty* newproperty )
 {
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-    wxPGProperty* retp = m_pState->DoInsert((wxPGProperty*)p,index,newproperty);
+    wxPGProperty* retp = m_pState->DoInsert(p,index,newproperty);
     RefreshGrid();
     return retp;
 }
@@ -323,7 +322,7 @@ bool wxPropertyGridInterface::ExpandAll( bool doExpand )
 
     for ( it = GetVIterator( wxPG_ITERATE_ALL ); !it.AtEnd(); it.Next() )
     {
-        wxPGProperty* p = (wxPGProperty*) it.GetProperty();
+        wxPGProperty* p = it.GetProperty();
         if ( p->GetChildCount() )
         {
             if ( doExpand )
@@ -452,13 +451,7 @@ void wxPropertyGridInterface::DoSetPropertyAttribute( wxPGPropArg id, const wxSt
 {
     wxPG_PROP_ARG_CALL_PROLOG()
 
-    p->SetAttribute( name, value );
-    // If property is attached to the property grid
-    // then refresh the view.
-    if( p->GetParentState() )
-    {
-        RefreshProperty( p );
-    }
+    p->SetAttribute( name, value ); // property is also refreshed here
 
     if ( argFlags & wxPG_RECURSE )
     {
@@ -499,17 +492,17 @@ void wxPropertyGridInterface::GetPropertiesWithFlag( wxArrayPGProperty* targetAr
           !it.AtEnd();
           it.Next() )
     {
-        const wxPGProperty* property = it.GetProperty();
+        wxPGProperty* property = it.GetProperty();
 
         if ( !inverse )
         {
             if ( property->HasFlagsExact(flags) )
-                targetArr->push_back((wxPGProperty*)property);
+                targetArr->push_back(property);
         }
         else
         {
             if ( !property->HasFlagsExact(flags) )
-                targetArr->push_back((wxPGProperty*)property);
+                targetArr->push_back(property);
         }
     }
 }
@@ -673,20 +666,18 @@ bool wxPropertyGridInterface::SetPropertyMaxLength( wxPGPropArg id, int maxLen )
 {
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
 
-    wxPropertyGrid* pg = m_pState->GetGrid();
+    if ( !p->SetMaxLength(maxLen) )
+        return false;
 
-    p->m_maxLen = (short) maxLen;
+    wxPropertyGrid* pg = m_pState->GetGrid();
 
     // Adjust control if selected currently
     if ( pg == p->GetGrid() && p == m_pState->GetSelection() )
     {
         wxWindow* wnd = pg->GetEditorControl();
-        wxTextCtrl* tc = wxDynamicCast(wnd,wxTextCtrl);
-        if ( tc )
-            tc->SetMaxLength( maxLen );
-        else
-        // Not a text ctrl
-            return false;
+        wxTextCtrl* tc = wxDynamicCast(wnd, wxTextCtrl);
+        wxCHECK_MSG(tc, false, "Text ctrl is expected here");
+        tc->SetMaxLength(maxLen);
     }
 
     return true;
@@ -1085,7 +1076,7 @@ bool wxPropertyGridInterface::RestoreEditableState( const wxString& src, int res
                 {
                     if ( restoreStates & SplitterPosState )
                     {
-                        for ( size_t n=1; n<values.size(); n++ )
+                        for ( size_t n=0; n<values.size(); n++ )
                         {
                             long pos = 0;
                             values[n].ToLong(&pos);
@@ -1181,7 +1172,12 @@ bool wxPropertyGridInterface::RestoreEditableState( const wxString& src, int res
 
     if ( selectedPage != -1 )
     {
+        wxPropertyGridPageState* curPageState = GetPageState(-1);
         DoSelectPage(selectedPage);
+        if ( GetPageState(-1) != curPageState )
+        {
+            pg->SendEvent(wxEVT_PG_SELECTED, pg->GetSelectedProperty());
+        }
     }
 
     if ( vx >= 0 )
diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index d53e1ac4de..a5b6fb583b 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -276,7 +276,7 @@ void wxPropertyGridPageState::InitNonCatMode()
 
 void wxPropertyGridPageState::DoClear()
 {
-    if ( m_pPropGrid && m_pPropGrid->GetState() == this )
+    if ( m_pPropGrid && IsDisplayed() )
     {
         m_pPropGrid->ClearSelection(false);
     }
@@ -398,6 +398,11 @@ void wxPropertyGridPageState::OnClientWidthChange( int newWidth, int widthChange
             }
         }
     }
+
+    if ( IsDisplayed() )
+    {
+        pg->SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL);
+    }
 }
 
 // -----------------------------------------------------------------------
@@ -412,10 +417,10 @@ wxPGProperty* wxPropertyGridPageState::GetLastItem( int flags )
     wxPG_ITERATOR_CREATE_MASKS(flags, wxPGProperty::FlagType itemExMask, wxPGProperty::FlagType parentExMask)
 
     // First, get last child of last parent
-    wxPGProperty* pwc = (wxPGProperty*)m_properties->Last();
+    wxPGProperty* pwc = m_properties->Last();
     while ( pwc->GetChildCount() &&
             wxPG_ITERATOR_PARENTEXMASK_TEST(pwc, parentExMask) )
-        pwc = (wxPGProperty*) pwc->Last();
+        pwc = pwc->Last();
 
     // Then, if it doesn't fit our criteria, back up until we find something that does
     if ( pwc->HasFlag(itemExMask) )
@@ -423,7 +428,7 @@ wxPGProperty* wxPropertyGridPageState::GetLastItem( int flags )
         wxPropertyGridIterator it( this, flags, pwc );
         for ( ; !it.AtEnd(); it.Prev() )
             ;
-        pwc = (wxPGProperty*) it.GetProperty();
+        pwc = it.GetProperty();
     }
 
     return pwc;
@@ -431,12 +436,12 @@ wxPGProperty* wxPropertyGridPageState::GetLastItem( int flags )
 
 wxPropertyCategory* wxPropertyGridPageState::GetPropertyCategory( const wxPGProperty* p ) const
 {
-    const wxPGProperty* parent = (const wxPGProperty*)p;
-    const wxPGProperty* grandparent = (const wxPGProperty*)parent->GetParent();
+    const wxPGProperty* parent = p;
+    const wxPGProperty* grandparent = parent->GetParent();
     do
     {
         parent = grandparent;
-        grandparent = (wxPGProperty*)parent->GetParent();
+        grandparent = parent->GetParent();
         if ( parent->IsCategory() && grandparent )
             return (wxPropertyCategory*)parent;
     } while ( grandparent );
@@ -637,7 +642,7 @@ bool wxPropertyGridPageState::EnableCategories( bool enable )
 
     VirtualHeightChanged();
 
-    if ( m_pPropGrid->GetState() == this )
+    if ( IsDisplayed() )
         m_pPropGrid->RecalculateVirtualSize();
 
     return true;
@@ -989,7 +994,7 @@ wxSize wxPropertyGridPageState::DoFitColumns( bool WXUNUSED(allowGridResize) )
     m_fSplitterX = (double) firstSplitterX;
 
     // Don't allow initial splitter auto-positioning after this.
-    if ( pg->GetState() == this )
+    if ( IsDisplayed() )
     {
         pg->SetSplitterPosition(firstSplitterX, false);
         pg->Refresh();
@@ -1024,6 +1029,8 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
     // Then mode-based requirement
     if ( !pg->HasVirtualWidth() )
     {
+        m_width = clientWidth;
+
         int widthHigher = m_width - colsWidth;
 
         // Adapt colsWidth to width
@@ -1058,16 +1065,14 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
     }
     else
     {
-        // Only check colsWidth against clientWidth
-        if ( colsWidth < clientWidth )
+        // Only adapt colsWidth to width
+        if ( colsWidth < m_width )
         {
-            m_colWidths.back() += (clientWidth-colsWidth);
+            m_colWidths.back() += (m_width-colsWidth);
         }
 
-        m_width = colsWidth;
-
         // If width changed, recalculate virtual size
-        if ( pg->GetState() == this )
+        if ( IsDisplayed() )
             pg->RecalculateVirtualSize();
     }
 
@@ -1162,10 +1167,9 @@ void wxPropertyGridPageState::SetColumnCount( int colCount )
     m_colWidths.resize(colCount, wxPG_DRAG_MARGIN);
     m_columnProportions.resize(colCount, 1);
 
-    if ( m_pPropGrid->GetState() == this )
+    CheckColumnWidths();
+    if ( IsDisplayed() )
         m_pPropGrid->RecalculateVirtualSize();
-    else
-        CheckColumnWidths();
 }
 
 void wxPropertyGridPageState::DoSetColumnProportion( unsigned int column,
@@ -1275,8 +1279,7 @@ bool wxPropertyGridPageState::DoSetPropertyValueString( wxPGProperty* p, const w
         if ( res )
         {
             p->SetValue(variant);
-            if ( p == m_pPropGrid->GetSelection() &&
-                 this == m_pPropGrid->GetState() )
+            if ( p == m_pPropGrid->GetSelection() && IsDisplayed() )
                 m_pPropGrid->RefreshEditor();
         }
 
@@ -1292,8 +1295,7 @@ bool wxPropertyGridPageState::DoSetPropertyValue( wxPGProperty* p, wxVariant& va
     if ( p )
     {
         p->SetValue(value);
-        if ( p == m_pPropGrid->GetSelection() &&
-             this == m_pPropGrid->GetState() )
+        if ( p == m_pPropGrid->GetSelection() && IsDisplayed() )
             m_pPropGrid->RefreshEditor();
 
         return true;
@@ -1333,7 +1335,7 @@ void wxPropertyGridPageState::DoRemoveFromSelection( wxPGProperty* prop )
         if ( m_selection[i] == prop )
         {
             wxPropertyGrid* pg = m_pPropGrid;
-            if ( i == 0 && pg->GetState() == this )
+            if ( i == 0 && IsDisplayed() )
             {
                 // If first item (i.e. one with the active editor) was
                 // deselected, then we need to take some extra measures.
@@ -1395,7 +1397,7 @@ bool wxPropertyGridPageState::DoExpand( wxPGProperty* p )
 
 bool wxPropertyGridPageState::DoSelectProperty( wxPGProperty* p, unsigned int flags )
 {
-    if ( this == m_pPropGrid->GetState() )
+    if ( IsDisplayed() )
         return m_pPropGrid->DoSelectProperty( p, flags );
 
     DoSetSelection(p);
@@ -1422,7 +1424,7 @@ wxVariant wxPropertyGridPageState::DoGetPropertyValues( const wxString& listname
                                                     wxPGProperty* baseparent,
                                                     long flags ) const
 {
-    wxPGProperty* pwc = (wxPGProperty*) baseparent;
+    wxPGProperty* pwc = baseparent;
 
     // Root is the default base-parent.
     if ( !pwc )
@@ -1485,7 +1487,7 @@ void wxPropertyGridPageState::DoSetPropertyValues( const wxVariantList& list, wx
 {
     bool origFrozen = true;
 
-    if ( m_pPropGrid->GetState() == this )
+    if ( IsDisplayed() )
     {
         origFrozen = m_pPropGrid->IsFrozen();
         if ( !origFrozen ) m_pPropGrid->Freeze();
@@ -1624,7 +1626,7 @@ void wxPropertyGridPageState::DoSetPropertyValues( const wxVariantList& list, wx
     {
         m_pPropGrid->Thaw();
 
-        if ( this == m_pPropGrid->GetState() )
+        if ( IsDisplayed() )
             m_pPropGrid->RefreshEditor();
     }
 
@@ -1830,7 +1832,7 @@ void wxPropertyGridPageState::DoRemoveChildrenFromSelection(wxPGProperty* p,
         wxPGProperty* child = p->Item(i);
         if ( DoIsPropertySelected(child) )
         {
-            if ( pg && pg->GetState() == this )
+            if ( pg && IsDisplayed() )
             {
                 pg->DoRemoveFromSelection(child, selFlags);
             }
@@ -1937,7 +1939,7 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
     // Try to unselect property and its sub-properties.
     if ( DoIsPropertySelected(item) )
     {
-        if ( pg && pg->GetState() == this )
+        if ( pg && IsDisplayed() )
         {
             pg->DoRemoveFromSelection(item,
                 wxPG_SEL_DELETING|wxPG_SEL_NOVALIDATE);
@@ -2041,10 +2043,10 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
             if ( p == item ) { cat_index = i; break; }
             if ( p->IsCategory() )
             {
-                int subind = ((wxPGProperty*)p)->Index(item);
+                int subind = p->Index(item);
                 if ( subind != wxNOT_FOUND )
                 {
-                    cat_parent = ((wxPGProperty*)p);
+                    cat_parent = p;
                     cat_index = subind;
                     break;
                 }
@@ -2103,6 +2105,16 @@ void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
     VirtualHeightChanged();
 }
 
+bool wxPropertyGridPageState::IsDisplayed() const
+{
+    return (this == m_pPropGrid->GetState());
+}
+
+unsigned int wxPropertyGridPageState::GetActualVirtualHeight() const
+{
+    return DoGetRoot()->GetChildrenHeight(GetGrid()->GetRowHeight());
+}
+
 // -----------------------------------------------------------------------
 
 #endif  // wxUSE_PROPGRID
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 8957bb5d59..69b636be36 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -142,12 +142,11 @@ bool wxStringProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 {
     if ( name == wxPG_STRING_PASSWORD )
     {
-        m_flags &= ~(wxPG_PROP_PASSWORD);
-        if ( value.GetLong() ) m_flags |= wxPG_PROP_PASSWORD;
+        ChangeFlag(wxPG_PROP_PASSWORD, value.GetBool());
         RecreateEditor();
-        return false;
+        return true;
     }
-    return true;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 // -----------------------------------------------------------------------
@@ -463,24 +462,19 @@ bool NumericValidation( const wxPGProperty* property,
 
     if ( minOk || maxOk )
     {
-        // Get required precision.
-        int precision = -1;
-        variant = property->GetAttribute(wxPG_FLOAT_PRECISION);
-        if ( !variant.IsNull() )
-        {
-            precision = variant.GetInteger();
-        }
-
         // Round current value to the required precision.
-        wxString strVal = wxNumberFormatter::ToString(value, precision, wxNumberFormatter::Style_None);
+        variant = value;
+        wxString strVal = property->ValueToString(variant, wxPG_FULL_VALUE);
         strVal.ToDouble(&value);
 
         // Round minimal value to the required precision.
-        strVal = wxNumberFormatter::ToString(min, precision, wxNumberFormatter::Style_None);
+        variant = min;
+        strVal = property->ValueToString(variant, wxPG_FULL_VALUE);
         strVal.ToDouble(&min);
 
         // Round maximal value to the required precision.
-        strVal = wxNumberFormatter::ToString(max, precision, wxNumberFormatter::Style_None);
+        variant = max;
+        strVal = property->ValueToString(variant, wxPG_FULL_VALUE);
         strVal.ToDouble(&max);
     }
 
@@ -878,7 +872,7 @@ bool wxUIntProperty::DoSetAttribute( const wxString& name, wxVariant& value )
         m_prefix = (wxByte) value.GetLong();
         return true;
     }
-    return false;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 // -----------------------------------------------------------------------
@@ -1038,17 +1032,7 @@ bool wxFloatProperty::DoSetAttribute( const wxString& name, wxVariant& value )
         m_precision = value.GetLong();
         return true;
     }
-    return false;
-}
-
-wxVariant wxFloatProperty::DoGetAttribute( const wxString& name ) const
-{
-    wxVariant value;
-    if ( name == wxPG_FLOAT_PRECISION )
-    {
-        value = (long)m_precision;
-    }
-    return value;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 wxValidator*
@@ -1179,39 +1163,16 @@ bool wxBoolProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 #if wxPG_INCLUDE_CHECKBOX
     if ( name == wxPG_BOOL_USE_CHECKBOX )
     {
-        if ( value.GetLong() )
-            m_flags |= wxPG_PROP_USE_CHECKBOX;
-        else
-            m_flags &= ~(wxPG_PROP_USE_CHECKBOX);
+        ChangeFlag(wxPG_PROP_USE_CHECKBOX, value.GetBool());
         return true;
     }
 #endif
     if ( name == wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING )
     {
-        if ( value.GetLong() )
-            m_flags |= wxPG_PROP_USE_DCC;
-        else
-            m_flags &= ~(wxPG_PROP_USE_DCC);
+        ChangeFlag(wxPG_PROP_USE_DCC, value.GetBool());
         return true;
     }
-    return false;
-}
-
-wxVariant wxBoolProperty::DoGetAttribute( const wxString& name ) const
-{
-    wxVariant value;
-#if wxPG_INCLUDE_CHECKBOX
-    if ( name == wxPG_BOOL_USE_CHECKBOX )
-    {
-        value = (bool)((m_flags & wxPG_PROP_USE_CHECKBOX) != 0);
-    }
-    else
-#endif
-    if ( name == wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING )
-    {
-        value = (bool)((m_flags & wxPG_PROP_USE_DCC) != 0);
-    }
-    return value;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 // -----------------------------------------------------------------------
@@ -1582,9 +1543,8 @@ void wxFlagsProperty::Init()
 
     // Relay wxPG_BOOL_USE_CHECKBOX and wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING
     // to child bool property controls.
-    long attrUseCheckBox = GetAttributeAsLong(wxPG_BOOL_USE_CHECKBOX, 0);
-    long attrUseDCC = GetAttributeAsLong(wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING,
-                                         0);
+    bool attrUseCheckBox = (m_flags & wxPG_PROP_USE_CHECKBOX) != 0;
+    bool attrUseDCC = (m_flags & wxPG_PROP_USE_DCC) != 0;
 
     if ( m_choices.IsOk() )
     {
@@ -1608,12 +1568,8 @@ void wxFlagsProperty::Init()
             {
                 boolProp = new wxBoolProperty( label, label, child_val );
             }
-            if ( attrUseCheckBox )
-                boolProp->SetAttribute(wxPG_BOOL_USE_CHECKBOX,
-                                       true);
-            if ( attrUseDCC )
-                boolProp->SetAttribute(wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING,
-                                       true);
+            boolProp->SetAttribute(wxPG_BOOL_USE_CHECKBOX, attrUseCheckBox);
+            boolProp->SetAttribute(wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING, attrUseDCC);
             AddPrivateChild(boolProp);
         }
 
@@ -1630,6 +1586,7 @@ wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name,
     const wxChar* const* labels, const long* values, long value ) : wxPGProperty(label,name)
 {
     m_oldChoicesData = NULL;
+    m_flags |= wxPG_PROP_USE_DCC; // same default like wxBoolProperty
 
     if ( labels )
     {
@@ -1650,6 +1607,7 @@ wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name,
     : wxPGProperty(label,name)
 {
     m_oldChoicesData = NULL;
+    m_flags |= wxPG_PROP_USE_DCC; // same default like wxBoolProperty
 
     if ( !labels.empty() )
     {
@@ -1670,6 +1628,7 @@ wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name,
     : wxPGProperty(label,name)
 {
     m_oldChoicesData = NULL;
+    m_flags |= wxPG_PROP_USE_DCC; // same default like wxBoolProperty
 
     if ( choices.IsOk() )
     {
@@ -1860,18 +1819,27 @@ wxVariant wxFlagsProperty::ChildChanged( wxVariant& thisValue,
 
 bool wxFlagsProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 {
-    if ( name == wxPG_BOOL_USE_CHECKBOX ||
-         name == wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING )
+    if ( name == wxPG_BOOL_USE_CHECKBOX )
     {
-        for ( size_t i=0; i<GetChildCount(); i++ )
+        ChangeFlag(wxPG_PROP_USE_CHECKBOX, value.GetBool());
+
+        for ( size_t i = 0; i < GetChildCount(); i++ )
         {
             Item(i)->SetAttribute(name, value);
         }
-        // Must return false so that the attribute is stored in
-        // flag property's actual property storage
-        return false;
+        return true;
     }
-    return false;
+    else if ( name == wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING )
+    {
+        ChangeFlag(wxPG_PROP_USE_DCC, value.GetBool());
+
+        for ( size_t i = 0; i < GetChildCount(); i++ )
+        {
+            Item(i)->SetAttribute(name, value);
+        }
+        return true;
+    }
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 // -----------------------------------------------------------------------
@@ -1936,7 +1904,7 @@ bool wxDirProperty::DoSetAttribute( const wxString& name, wxVariant& value )
         m_dlgMessage = value.GetString();
         return true;
     }
-    return false;
+    return wxLongStringProperty::DoSetAttribute(name, value);
 }
 
 // -----------------------------------------------------------------------
@@ -1945,44 +1913,16 @@ bool wxDirProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 
 bool wxPGFileDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property )
 {
-    wxFileProperty* fileProp = NULL;
-    wxString path;
-    int indFilter = -1;
+    wxFileProperty* prop = wxDynamicCast(property, wxFileProperty);
+    wxCHECK_MSG( prop, false, "Function called for incompatible property" );
 
-    if ( wxDynamicCast(property, wxFileProperty) )
+    wxString value = prop->GetValueAsString(0);
+    if ( prop->DisplayEditorDialog(propGrid, value) )
     {
-        fileProp = ((wxFileProperty*)property);
-        wxFileName filename = fileProp->GetValue().GetString();
-        path = filename.GetPath();
-        indFilter = fileProp->m_indFilter;
-
-        if ( path.empty() && !fileProp->m_basePath.empty() )
-            path = fileProp->m_basePath;
-    }
-    else
-    {
-        wxFileName fn(property->GetValue().GetString());
-        path = fn.GetPath();
-    }
-
-    wxFileDialog dlg( propGrid->GetPanel(),
-                      property->GetAttribute(wxS("DialogTitle"), _("Choose a file")),
-                      property->GetAttribute(wxS("InitialPath"), path),
-                      wxEmptyString,
-                      property->GetAttribute(wxPG_FILE_WILDCARD, wxALL_FILES),
-                      property->GetAttributeAsLong(wxPG_FILE_DIALOG_STYLE, 0),
-                      wxDefaultPosition );
-
-    if ( indFilter >= 0 )
-        dlg.SetFilterIndex( indFilter );
-
-    if ( dlg.ShowModal() == wxID_OK )
-    {
-        if ( fileProp )
-            fileProp->m_indFilter = dlg.GetFilterIndex();
-        SetValue( dlg.GetPath() );
+        SetValue(value);
         return true;
     }
+
     return false;
 }
 
@@ -1997,7 +1937,8 @@ wxFileProperty::wxFileProperty( const wxString& label, const wxString& name,
 {
     m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
     m_indFilter = -1;
-    SetAttribute( wxPG_FILE_WILDCARD, wxALL_FILES);
+    m_dlgStyle = 0;
+    m_wildcard = wxALL_FILES;
 
     SetValue(value);
 }
@@ -2150,19 +2091,15 @@ bool wxFileProperty::StringToValue( wxVariant& variant, const wxString& text, in
 
 bool wxFileProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 {
-    // Return false on some occasions to make sure those attributes will get
-    // stored in m_attributes.
     if ( name == wxPG_FILE_SHOW_FULL_PATH )
     {
-        if ( value.GetLong() )
-            m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
-        else
-            m_flags &= ~(wxPG_PROP_SHOW_FULL_FILENAME);
+        ChangeFlag(wxPG_PROP_SHOW_FULL_FILENAME, value.GetBool());
         return true;
     }
     else if ( name == wxPG_FILE_WILDCARD )
     {
         m_wildcard = value.GetString();
+        return true;
     }
     else if ( name == wxPG_FILE_SHOW_RELATIVE_PATH )
     {
@@ -2170,6 +2107,7 @@ bool wxFileProperty::DoSetAttribute( const wxString& name, wxVariant& value )
 
         // Make sure wxPG_FILE_SHOW_FULL_PATH is also set
         m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
+        return true;
     }
     else if ( name == wxPG_FILE_INITIAL_PATH )
     {
@@ -2181,6 +2119,39 @@ bool wxFileProperty::DoSetAttribute( const wxString& name, wxVariant& value )
         m_dlgTitle = value.GetString();
         return true;
     }
+    else if ( name == wxPG_FILE_DIALOG_STYLE )
+    {
+        m_dlgStyle = value.GetLong();
+        return true;
+    }
+    return wxPGProperty::DoSetAttribute(name, value);
+}
+
+bool wxFileProperty::DisplayEditorDialog(wxPropertyGrid* propGrid, wxString& value)
+{
+    wxFileName filename = value;
+    wxString path = filename.GetPath();
+
+    if ( path.empty() && !m_basePath.empty() )
+        path = m_basePath;
+
+    wxFileDialog dlg(propGrid->GetPanel(),
+        m_dlgTitle.empty() ? _("Choose a file") : m_dlgTitle,
+        m_initialPath.empty() ? path : m_initialPath,
+        value,
+        m_wildcard.empty() ? wxALL_FILES : m_wildcard,
+        m_dlgStyle,
+        wxDefaultPosition);
+
+    if ( m_indFilter >= 0 )
+        dlg.SetFilterIndex(m_indFilter);
+
+    if ( dlg.ShowModal() == wxID_OK )
+    {
+        m_indFilter = dlg.GetFilterIndex();
+        value = dlg.GetPath();
+        return true;
+    }
     return false;
 }
 
@@ -2295,6 +2266,9 @@ bool wxLongStringProperty::DisplayEditorDialog( wxPGProperty* prop, wxPropertyGr
         edStyle |= wxTE_READONLY;
     wxTextCtrl* ed = new wxTextCtrl(dlg,wxID_ANY,value,
         wxDefaultPosition,wxDefaultSize,edStyle);
+    int maxLen = prop->GetMaxLength();
+    if ( maxLen > 0 )
+        ed->SetMaxLength(maxLen);
 
     rowsizer->Add(ed, wxSizerFlags(1).Expand().Border(wxALL, spacing));
     topsizer->Add(rowsizer, wxSizerFlags(1).Expand());
@@ -2941,9 +2915,9 @@ bool wxArrayStringProperty::DoSetAttribute( const wxString& name, wxVariant& val
     {
         m_delimiter = value.GetChar();
         GenerateValueAsString();
-        return false;
+        return true;
     }
-    return true;
+    return wxPGProperty::DoSetAttribute(name, value);
 }
 
 // -----------------------------------------------------------------------
diff --git a/src/qt/anybutton.cpp b/src/qt/anybutton.cpp
index acb5f4c6fd..1bf235bd46 100644
--- a/src/qt/anybutton.cpp
+++ b/src/qt/anybutton.cpp
@@ -69,6 +69,9 @@ bool wxQtPushButton::event(QEvent* e)
     case QEvent::FocusIn:
     case QEvent::FocusOut:
         GetHandler()->QtUpdateState();
+        break;
+    default:
+        break;
     }
 
     return QPushButton::event(e);
diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp
index 0acde39f70..fa884271da 100644
--- a/src/qt/cursor.cpp
+++ b/src/qt/cursor.cpp
@@ -142,7 +142,7 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
 */
     default:
         wxFAIL_MSG(wxT("unsupported cursor type"));
-        // will use the standard one
+        qt_cur = Qt::ArrowCursor;
         break;
     }
 
diff --git a/src/qt/dnd.cpp b/src/qt/dnd.cpp
index 4e5af17028..ed8ca9e898 100644
--- a/src/qt/dnd.cpp
+++ b/src/qt/dnd.cpp
@@ -37,6 +37,8 @@ wxDragResult DropActionToDragResult(Qt::DropAction action)
             return wxDragMove;
         case Qt::LinkAction:
             return wxDragLink;
+        default:
+            break;
     }
 
     wxFAIL_MSG("Illegal drop action");
diff --git a/src/qt/evtloop.cpp b/src/qt/evtloop.cpp
index 0f88c0f4ad..3523099ae3 100644
--- a/src/qt/evtloop.cpp
+++ b/src/qt/evtloop.cpp
@@ -27,7 +27,7 @@ class wxQtIdleTimer : public QTimer, public wxRefCounter
 public:
     wxQtIdleTimer();
     ~wxQtIdleTimer();
-    virtual bool eventFilter( QObject * watched, QEvent * event  );
+    virtual bool eventFilter( QObject * watched, QEvent * event  ) wxOVERRIDE;
 
 private:
     void idle();
@@ -239,7 +239,7 @@ class wxQtEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
 {
 public:
     wxEventLoopSource*
-    AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags)
+    AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags) wxOVERRIDE
     {
         return new wxQtEventLoopSource(fd, handler, flags);
     }
diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
index 2492927aff..be927ce2cd 100644
--- a/src/qt/frame.cpp
+++ b/src/qt/frame.cpp
@@ -107,9 +107,9 @@ void wxFrame::SetStatusBar( wxStatusBar *statusBar )
 
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
-    int area = 0;
     if ( toolbar != NULL )
     {
+        int area = 0;
         if      (toolbar->HasFlag(wxTB_LEFT))  { area = Qt::LeftToolBarArea;  }
         else if (toolbar->HasFlag(wxTB_RIGHT)) { area = Qt::RightToolBarArea; }
         else if (toolbar->HasFlag(wxTB_BOTTOM)){ area = Qt::BottomToolBarArea;}
diff --git a/src/qt/glcanvas.cpp b/src/qt/glcanvas.cpp
index 2430d84384..60be7159f9 100644
--- a/src/qt/glcanvas.cpp
+++ b/src/qt/glcanvas.cpp
@@ -25,13 +25,13 @@ public:
         }
 
 protected:
-    virtual void showEvent ( QShowEvent * event );
-    virtual void hideEvent ( QHideEvent * event );
-    virtual void resizeEvent ( QResizeEvent * event );
-    virtual void paintEvent ( QPaintEvent * event );
+    virtual void showEvent ( QShowEvent * event ) wxOVERRIDE;
+    virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE;
+    virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE;
+    virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE;
 
-    virtual void resizeGL(int w, int h);
-    virtual void paintGL();
+    virtual void resizeGL(int w, int h) wxOVERRIDE;
+    virtual void paintGL() wxOVERRIDE;
 };
 
 void wxQtGLWidget::showEvent ( QShowEvent * event )
diff --git a/src/qt/listbox.cpp b/src/qt/listbox.cpp
index 6b5152b60b..9e5ab77853 100644
--- a/src/qt/listbox.cpp
+++ b/src/qt/listbox.cpp
@@ -88,10 +88,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 {
     DoCreate(parent, style);
 
-    QListWidgetItem* item;
-
     while ( n-- > 0 )
     {
+        QListWidgetItem* item;
         item = new QListWidgetItem();
         item->setText(wxQtConvertString( *choices++ ));
         if ( m_hasCheckBoxes )
diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp
index 2c13dd1f40..587961d3da 100644
--- a/src/qt/listctrl.cpp
+++ b/src/qt/listctrl.cpp
@@ -878,12 +878,12 @@ bool wxListCtrl::EnsureVisible(long item)
 
 long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
 {
-    int ret;
     QList <QTreeWidgetItem *> qitems = m_qtTreeWidget->findItems(
                 wxQtConvertString(str),
                 !partial ? Qt::MatchExactly : Qt::MatchContains );
     for (int i=0; i<qitems.length(); i++)
     {
+        int ret;
         ret = m_qtTreeWidget->indexOfTopLevelItem(qitems.at(i));
         if ( ret >= start )
             return ret;
@@ -1010,35 +1010,6 @@ bool wxListCtrl::SortItems(wxListCtrlCompare WXUNUSED(fn), wxIntPtr WXUNUSED(dat
     return false;
 }
 
-// ----------------------------------------------------------------------------
-// virtual list controls (not currently implemented in wxQT)
-// ----------------------------------------------------------------------------
-
-wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) const
-{
-    // this is a pure virtual function, in fact - which is not really pure
-    // because the controls which are not virtual don't need to implement it
-    wxFAIL_MSG( wxT("wxListCtrl::OnGetItemText not supposed to be called") );
-
-    return wxEmptyString;
-}
-
-int wxListCtrl::OnGetItemImage(long WXUNUSED(item)) const
-{
-    wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
-                -1,
-                wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
-    return -1;
-}
-
-int wxListCtrl::OnGetItemColumnImage(long item, long column) const
-{
-    if (!column)
-        return OnGetItemImage(item);
-
-    return -1;
-}
-
 QWidget *wxListCtrl::GetHandle() const
 {
     return m_qtTreeWidget;
diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp
index 61d9d5935f..b07a3478cd 100644
--- a/src/qt/menu.cpp
+++ b/src/qt/menu.cpp
@@ -115,6 +115,8 @@ static void InsertMenuItemAction( const wxMenu *menu, const wxMenuItem *previous
             }
             break;
         }
+        default:
+            break;
     }
     // Insert the action into the actual menu:
     QAction *successiveItemAction = ( successiveItem != NULL ) ? successiveItem->GetHandle() : NULL;
diff --git a/src/qt/msgdlg.cpp b/src/qt/msgdlg.cpp
index f0ffa42427..803c78205b 100644
--- a/src/qt/msgdlg.cpp
+++ b/src/qt/msgdlg.cpp
@@ -110,6 +110,8 @@ wxMessageDialog::wxMessageDialog( wxWindow *parent, const wxString& message,
         dlg->setWindowModality( Qt::ApplicationModal );
 
     PostCreation();
+
+    Centre(wxBOTH | wxCENTER_FRAME);
 }
 
 wxIMPLEMENT_CLASS(wxMessageDialog,wxDialog);
diff --git a/src/qt/settings.cpp b/src/qt/settings.cpp
index 83b3ea5016..418f7bc25e 100644
--- a/src/qt/settings.cpp
+++ b/src/qt/settings.cpp
@@ -144,9 +144,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_OEM_FIXED_FONT:
         case wxSYS_ANSI_FIXED_FONT:
         case wxSYS_SYSTEM_FIXED_FONT:
-            // let Qt font matching algorithm to select the font
             font.SetFamily(wxFONTFAMILY_TELETYPE);
-            font.SetFaceName("monospace");
             break;
 
         case wxSYS_ANSI_VAR_FONT:
@@ -154,9 +152,8 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEVICE_DEFAULT_FONT:
         case wxSYS_DEFAULT_GUI_FONT:
         default:
-            // let Qt font matching algorithm to select the font
-            font.SetFamily(wxFONTFAMILY_DEFAULT);
-            font.SetFaceName("");
+            // Let Qt select any sans serif font.
+            font.SetFamily(wxFONTFAMILY_SWISS);
             break;
     }
 
diff --git a/src/qt/sockqt.cpp b/src/qt/sockqt.cpp
index 239b4bfed6..cbd5faad18 100644
--- a/src/qt/sockqt.cpp
+++ b/src/qt/sockqt.cpp
@@ -54,7 +54,7 @@ public:
 class QtFDIOManager : public wxFDIOManager
 {
 public:
-    virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d)
+    virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) wxOVERRIDE
     {
         QSocketNotifier::Type type;
         switch (d)
@@ -73,7 +73,7 @@ public:
     }
 
     virtual void
-    RemoveInput(wxFDIOHandler* handler, int fd, Direction d)
+    RemoveInput(wxFDIOHandler* handler, int fd, Direction d) wxOVERRIDE
     {
         QSocketNotifier::Type type = d == INPUT ? QSocketNotifier::Read :
                                                   QSocketNotifier::Write;
diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp
index 47bc23e968..2fb0cff3dc 100644
--- a/src/qt/toolbar.cpp
+++ b/src/qt/toolbar.cpp
@@ -46,8 +46,8 @@ public:
         m_qtToolButton = NULL;
     }
 
-    virtual void SetLabel( const wxString &label );
-    virtual void SetDropdownMenu(wxMenu* menu);
+    virtual void SetLabel( const wxString &label ) wxOVERRIDE;
+    virtual void SetDropdownMenu(wxMenu* menu) wxOVERRIDE;
 
     void SetIcon();
     void ClearToolTip();
@@ -67,9 +67,9 @@ public:
     }
 
 private:
-    void mouseReleaseEvent( QMouseEvent *event );
-    void mousePressEvent( QMouseEvent *event );
-    void enterEvent( QEvent *event );
+    void mouseReleaseEvent( QMouseEvent *event ) wxOVERRIDE;
+    void mousePressEvent( QMouseEvent *event ) wxOVERRIDE;
+    void enterEvent( QEvent *event ) wxOVERRIDE;
 };
 
 void wxQtToolButton::mouseReleaseEvent( QMouseEvent *event )
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index c6afec9af8..aabf049ad8 100644
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -241,7 +241,25 @@ wxWindowQt::wxWindowQt(wxWindowQt *parent, wxWindowID id, const wxPoint& pos, co
 
 wxWindowQt::~wxWindowQt()
 {
-    SendDestroyEvent();
+    if ( !m_qtWindow )
+    {
+        wxLogTrace(TRACE_QT_WINDOW, wxT("wxWindow::~wxWindow %s m_qtWindow is NULL"), GetName());
+        return;
+    }
+
+    // Delete only if the qt widget was created or assigned to this base class
+    wxLogTrace(TRACE_QT_WINDOW, wxT("wxWindow::~wxWindow %s m_qtWindow=%p"), GetName(), m_qtWindow);
+
+    if ( !IsBeingDeleted() )
+    {
+        SendDestroyEvent();
+    }
+
+    // Avoid processing pending events which quite often would lead to crashes after this.
+    QCoreApplication::removePostedEvents(m_qtWindow);
+
+    // Block signals because the handlers access members of a derived class.
+    m_qtWindow->blockSignals(true);
 
     if ( s_capturedWindow == this )
         s_capturedWindow = NULL;
@@ -252,17 +270,7 @@ wxWindowQt::~wxWindowQt()
     SetDropTarget(NULL);
 #endif
 
-    // Delete only if the qt widget was created or assigned to this base class
-    if (m_qtWindow)
-    {
-        wxLogTrace(TRACE_QT_WINDOW, wxT("wxWindow::~wxWindow %s m_qtWindow=%p"), GetName(), m_qtWindow);
-
-        delete m_qtWindow;
-    }
-    else
-    {
-        wxLogTrace(TRACE_QT_WINDOW, wxT("wxWindow::~wxWindow %s m_qtWindow is NULL"), GetName());
-    }
+    delete m_qtWindow;
 }
 
 
@@ -1415,7 +1423,6 @@ bool wxWindowQt::QtHandleMouseEvent ( QWidget *handler, QMouseEvent *event )
                 e.SetEventType( wxEVT_LEAVE_WINDOW );
 
             ProcessWindowEvent( e );
-            m_mouseInside = mouseInside;
         }
     }
 
diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index ab8993ae51..97d3750ec1 100644
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -255,6 +255,8 @@ void wxRibbonAUIArtProvider::SetColourScheme(
 #else
     m_tab_label_colour = LikePrimary(0.1);
 #endif
+    m_tab_active_label_colour = m_tab_label_colour;
+    m_tab_hover_label_colour = m_tab_label_colour;
     m_tab_hover_background_top_colour =  primary_hsl.ToRGB();
 #ifdef __WXMAC__
     if ( wxPlatformInfo::Get().CheckOSVersion(10, 10 ) )
@@ -470,7 +472,19 @@ void wxRibbonAUIArtProvider::DrawTab(wxDC& dc,
         wxString label = tab.page->GetLabel();
         if(!label.IsEmpty())
         {
-            dc.SetTextForeground(m_tab_label_colour);
+            if (tab.active)
+            {
+                dc.SetTextForeground(m_tab_active_label_colour);
+            }
+            else if (tab.hovered)
+            {
+                dc.SetTextForeground(m_tab_hover_label_colour);
+            }
+            else
+            {
+                dc.SetTextForeground(m_tab_label_colour);
+            }
+
             dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 
             int offset = 0;
diff --git a/src/ribbon/art_msw.cpp b/src/ribbon/art_msw.cpp
index 07b4114b59..b64ee75f77 100644
--- a/src/ribbon/art_msw.cpp
+++ b/src/ribbon/art_msw.cpp
@@ -266,13 +266,13 @@ static const char * const ribbon_help_button_xpm[] = {
 };
 
 wxRibbonMSWArtProvider::wxRibbonMSWArtProvider(bool set_colour_scheme)
+#if defined( __WXMAC__ )
+    : m_tab_label_font(*wxSMALL_FONT)
+#else
+    : m_tab_label_font(*wxNORMAL_FONT)
+#endif
 {
     m_flags = 0;
-#if defined( __WXMAC__ )
-    m_tab_label_font = *wxSMALL_FONT;
-#else
-    m_tab_label_font = *wxNORMAL_FONT;
-#endif
     m_button_bar_label_font = m_tab_label_font;
     m_panel_label_font = m_tab_label_font;
 
@@ -386,6 +386,8 @@ void wxRibbonMSWArtProvider::SetColourScheme(
     m_tab_separator_gradient_colour = LikePrimary(1.7, -0.15, -0.18);
     m_tab_hover_background_top_gradient_colour = LikePrimary(1.8, 0.34, 0.13);
     m_tab_label_colour = LikePrimary(4.3, 0.13, -0.49);
+    m_tab_active_label_colour = m_tab_label_colour;
+    m_tab_hover_label_colour = m_tab_label_colour;
     m_tab_hover_background_gradient_colour = LikeSecondary(-1.5, -0.34, 0.01);
 
     m_panel_minimised_border_gradient_pen = LikePrimary(-6.9, -0.17, -0.09);
@@ -528,6 +530,8 @@ void wxRibbonMSWArtProvider::CloneTo(wxRibbonMSWArtProvider* copy) const
     copy->m_button_bar_label_colour = m_button_bar_label_colour;
     copy->m_button_bar_label_disabled_colour = m_button_bar_label_disabled_colour;
     copy->m_tab_label_colour = m_tab_label_colour;
+    copy->m_tab_active_label_colour = m_tab_active_label_colour;
+    copy->m_tab_hover_label_colour = m_tab_hover_label_colour;
     copy->m_tab_separator_colour = m_tab_separator_colour;
     copy->m_tab_separator_gradient_colour = m_tab_separator_gradient_colour;
     copy->m_tab_active_background_colour = m_tab_hover_background_colour;
@@ -849,6 +853,10 @@ wxColour wxRibbonMSWArtProvider::GetColour(int id) const
             return m_tab_ctrl_background_brush.GetColour();
         case wxRIBBON_ART_TAB_LABEL_COLOUR:
             return m_tab_label_colour;
+        case wxRIBBON_ART_TAB_ACTIVE_LABEL_COLOUR:
+            return m_tab_active_label_colour;
+        case wxRIBBON_ART_TAB_HOVER_LABEL_COLOUR:
+            return m_tab_hover_label_colour;
         case wxRIBBON_ART_TAB_SEPARATOR_COLOUR:
             return m_tab_separator_colour;
         case wxRIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR:
@@ -1094,6 +1102,12 @@ void wxRibbonMSWArtProvider::SetColour(int id, const wxColor& colour)
         case wxRIBBON_ART_TAB_LABEL_COLOUR:
             m_tab_label_colour = colour;
             break;
+        case wxRIBBON_ART_TAB_ACTIVE_LABEL_COLOUR:
+            m_tab_active_label_colour = colour;
+            break;
+        case wxRIBBON_ART_TAB_HOVER_LABEL_COLOUR:
+            m_tab_hover_label_colour = colour;
+            break;
         case wxRIBBON_ART_TAB_SEPARATOR_COLOUR:
             m_tab_separator_colour = colour;
             m_cached_tab_separator_visibility = -1.0;
@@ -1372,7 +1386,20 @@ void wxRibbonMSWArtProvider::DrawTab(
         if(!label.IsEmpty())
         {
             dc.SetFont(m_tab_label_font);
-            dc.SetTextForeground(m_tab_label_colour);
+
+            if (tab.active)
+            {
+                dc.SetTextForeground(m_tab_active_label_colour);
+            }
+            else if (tab.hovered)
+            {
+                dc.SetTextForeground(m_tab_hover_label_colour);
+            }
+            else
+            {
+                dc.SetTextForeground(m_tab_label_colour);
+            }
+
             dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 
             int text_height;
diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index 9804ec19d7..e96f85c2ab 100644
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -1258,7 +1258,7 @@ wxSize wxRibbonBar::DoGetBestSize() const
 
 void wxRibbonBar::HitTestRibbonButton(const wxRect& rect, const wxPoint& position, bool &hover_flag)
 {
-    bool hovered = false, toggle_button_hovered = false;
+    bool hovered = false;
     if(position.x >= 0 && position.y >= 0)
     {
         wxSize size = GetSize();
@@ -1269,6 +1269,7 @@ void wxRibbonBar::HitTestRibbonButton(const wxRect& rect, const wxPoint& positio
     }
     if(hovered)
     {
+        bool toggle_button_hovered;
         toggle_button_hovered = rect.Contains(position);
 
         if ( hovered != m_bar_hovered || toggle_button_hovered != hover_flag )
diff --git a/src/ribbon/page.cpp b/src/ribbon/page.cpp
index a97b002c4b..171cd62ced 100644
--- a/src/ribbon/page.cpp
+++ b/src/ribbon/page.cpp
@@ -1008,7 +1008,6 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
 {
     while(minimum_amount > 0)
     {
-        int largest_size = 0;
         wxRibbonPanel* largest_panel = NULL;
         wxSize* largest_panel_size = NULL;
         wxSize* panel_size = m_size_calc_array;
@@ -1032,6 +1031,7 @@ bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
         }
         else
         {
+            int largest_size = 0;
             for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
                       node;
                       node = node->GetNext(), ++panel_size )
diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 64ed956ad7..ec6c2e0054 100644
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -869,8 +869,6 @@ void wxRibbonToolBar::OnSize(wxSizeEvent& evt)
     if (sizingFlexibly)
         major_axis = wxHORIZONTAL;
 
-    wxSize bestSize = m_sizes[0];
-
     if(m_nrows_max != m_nrows_min)
     {
         int area = 0;
@@ -881,7 +879,6 @@ void wxRibbonToolBar::OnSize(wxSizeEvent& evt)
             {
                 area = GetSizeInOrientation(m_sizes[i], major_axis);
                 row_count = m_nrows_min + i;
-                bestSize = m_sizes[i];
             }
         }
     }
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 901cb33331..fb9e09e652 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -258,8 +258,8 @@ int wxRichTextFloatCollector::GetWidthFromFloatRect(const wxRichTextFloatRectMap
 }
 
 wxRichTextFloatCollector::wxRichTextFloatCollector(const wxRect& rect) : m_left(wxRichTextFloatRectMapCmp), m_right(wxRichTextFloatRectMapCmp)
+    , m_availableRect(rect)
 {
-    m_availableRect = rect;
     m_para = NULL;
 }
 
@@ -866,7 +866,7 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxRi
             wxPen pen(col, borderLeft, penStyle);
             dc.SetPen(pen);
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
-            dc.DrawRoundedRectangle(rect, cornerRadius);
+            dc.DrawRoundedRectangle(rect2, cornerRadius);
             return true;
         }
     }
@@ -7026,8 +7026,6 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr,
     else
         tabCount = 0;
 
-    int nextTabPos = -1;
-    int tabPos = -1;
     wxCoord w, h;
 
     if (selected)
@@ -7061,10 +7059,12 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr,
         wxString stringChunk = str.BeforeFirst(wxT('\t'));
         str = str.AfterFirst(wxT('\t'));
         dc.GetTextExtent(stringChunk, & w, & h);
+        int tabPos;
         tabPos = x + w;
         bool not_found = true;
         for (int i = 0; i < tabCount && not_found; ++i)
         {
+            int nextTabPos;
             nextTabPos = tabArray.Item(i) + x_orig;
 
             // Find the next tab position.
@@ -7253,8 +7253,6 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
             tabArray[i] = pos;
         }
 
-        int nextTabPos = -1;
-
         while (stringChunk.Find(wxT('\t')) >= 0)
         {
             int absoluteWidth = 0;
@@ -7295,6 +7293,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
             bool notFound = true;
             for (int i = 0; i < tabCount && notFound; ++i)
             {
+                int nextTabPos;
                 nextTabPos = tabArray.Item(i);
 
                 // Find the next tab position.
@@ -9302,7 +9301,7 @@ bool wxRichTextStdRenderer::MeasureBullet(wxRichTextParagraph* paragraph, wxDC&
     if (attr.GetBulletStyle() & wxTEXT_ATTR_BULLET_STYLE_STANDARD)
     {
         sz.x = (int) (((float) dc.GetCharHeight()) * wxRichTextBuffer::GetBulletProportion());
-        sz.y = sz.y;
+        sz.y = sz.x;
     }
     else if (attr.HasBulletText())
     {
@@ -9657,13 +9656,13 @@ bool wxRichTextFieldTypeStandard::Draw(wxRichTextField* obj, wxDC& dc, wxRichTex
                 label = wxT("??");
             int w, h, maxDescent;
             dc.SetFont(m_font);
-            dc.GetTextExtent(m_label, & w, &h, & maxDescent);
+            dc.GetTextExtent(label, &w, &h, &maxDescent);
             dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
             dc.SetTextForeground(textColour);
 
             int x = clientArea.x + (clientArea.width - w)/2;
             int y = clientArea.y + (clientArea.height - h)/2;
-            dc.DrawText(m_label, x, y);
+            dc.DrawText(label, x, y);
         }
     }
 
@@ -11523,7 +11522,6 @@ bool wxRichTextTableBlock::ComputeBlockForSelection(wxRichTextTable* table, wxRi
     {
         // Start with an invalid block and increase.
         wxRichTextTableBlock selBlock(-1, -1, -1, -1);
-        wxRichTextRangeArray ranges = selection.GetRanges();
         int row, col;
         for (row = 0; row < table->GetRowCount(); row++)
         {
@@ -14318,13 +14316,15 @@ void wxTextAttrDimension::CollectCommonAttributes(const wxTextAttrDimension& att
 }
 
 wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(wxDC& dc, double scale, const wxSize& parentSize)
+    : m_parentSize(parentSize)
 {
-    m_ppi = dc.GetPPI().x; m_scale = scale; m_parentSize = parentSize;
+    m_ppi = dc.GetPPI().x; m_scale = scale;
 }
 
 wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(int ppi, double scale, const wxSize& parentSize)
+    : m_parentSize(parentSize)
 {
-    m_ppi = ppi; m_scale = scale; m_parentSize = parentSize;
+    m_ppi = ppi; m_scale = scale;
 }
 
 int wxTextAttrDimensionConverter::ConvertTenthsMMToPixels(int units) const
diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 844f264419..7840ef29a9 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -2737,7 +2737,7 @@ long wxRichTextCtrl::FindNextWordPosition(int direction) const
 
             if (text.empty()) // End of paragraph, or maybe an image
                 return wxMax(-1, i - 1);
-            else if (wxRichTextCtrlIsWhitespace(text) || text.empty())
+            else if (wxRichTextCtrlIsWhitespace(text))
                 i += direction;
             else
             {
@@ -5407,10 +5407,7 @@ void wxRichTextCaret::DoSize()
     {
         m_countVisible = 0;
         DoHide();
-    }
 
-    if (countVisible > 0)
-    {
         m_countVisible = countVisible;
         DoShow();
     }
diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 5fd0d7858d..4d61368a36 100644
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -120,13 +120,9 @@ bool wxRichTextFormattingDialog::Create(long flags, wxWindow* parent, const wxSt
     SetWindowVariant(wxWINDOW_VARIANT_SMALL);
 #endif
 
-    int resizeBorder = wxRESIZE_BORDER;
-
     GetFormattingDialogFactory()->SetSheetStyle(this);
 
-    wxPropertySheetDialog::Create(parent, id, title, pos, sz,
-        style | (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder)
-    );
+    wxPropertySheetDialog::Create(parent, id, title, pos, sz, style | wxRESIZE_BORDER);
 
     GetFormattingDialogFactory()->CreateButtons(this);
     GetFormattingDialogFactory()->CreatePages(flags, this);
diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp
index 601f9d6862..c032e3d100 100644
--- a/src/richtext/richtextprint.cpp
+++ b/src/richtext/richtextprint.cpp
@@ -447,16 +447,15 @@ bool wxRichTextPrintout::SubstituteKeywords(wxString& str, const wxString& title
  */
 
 wxRichTextPrinting::wxRichTextPrinting(const wxString& name, wxWindow *parentWindow)
+    : m_title(name)
+    , m_previewRect(100, 100, 800, 800)
 {
     m_richTextBufferPrinting = NULL;
     m_richTextBufferPreview = NULL;
 
     m_parentWindow = parentWindow;
-    m_title = name;
     m_printData = NULL;
 
-    m_previewRect = wxRect(wxPoint(100, 100), wxSize(800, 800));
-
     m_pageSetupData = new wxPageSetupDialogData;
     m_pageSetupData->EnableMargins(true);
     m_pageSetupData->SetMarginTopLeft(wxPoint(25, 25));
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index ffb3db94bc..c9fdfe9ee8 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -27,10 +27,18 @@
 #include "wx/encconv.h"
 #include "wx/listctrl.h"
 #include "wx/mstream.h"
+#include "wx/xpmdecod.h"
 #include "wx/image.h"
-#include "wx/imaglist.h"
 #include "wx/tokenzr.h"
 #include "wx/dynlib.h"
+#include "wx/scopedarray.h"
+#include "wx/toplevel.h"
+#include "wx/vlbox.h"
+#include "wx/sizer.h"
+#include "wx/renderer.h"
+#include "wx/hashset.h"
+#include "wx/dcclient.h"
+#include "wx/wupdlock.h"
 
 #ifdef wxHAS_RAW_BITMAP
 #include "wx/rawbmp.h"
@@ -54,6 +62,14 @@
 #include "wx/dcscreen.h"
 #endif
 
+#if defined(__WXGTK__) && wxSTC_POPUP_IS_FRAME
+    #include "wx/gtk/private/wrapgtk.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/wrapwin.h"
+#elif defined(__WXOSX_COCOA__)
+    #include "PlatWXcocoa.h"
+#endif
+
 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
 }
@@ -508,17 +524,36 @@ wxBitmap BitmapFromRGBAImage(int width, int height, const unsigned char *pixelsI
     }
     return bmp;
 }
+#else
+wxBitmap BitmapFromRGBAImage(int width, int height, const unsigned char *pixelsImage)
+{
+    const int totalPixels = width * height;
+    wxScopedArray<unsigned char> data(3*totalPixels);
+    wxScopedArray<unsigned char> alpha(totalPixels);
+    int curDataLocation = 0, curAlphaLocation = 0, curPixelsImageLocation = 0;
+
+    for ( int i = 0; i < totalPixels; ++i )
+    {
+        data[curDataLocation++] = pixelsImage[curPixelsImageLocation++];
+        data[curDataLocation++] = pixelsImage[curPixelsImageLocation++];
+        data[curDataLocation++] = pixelsImage[curPixelsImageLocation++];
+        alpha[curAlphaLocation++] = pixelsImage[curPixelsImageLocation++];
+    }
+
+    wxImage img(width, height, data.get(), alpha.get(), true);
+    wxBitmap bmp(img);
+
+    return bmp;
+}
 #endif
 
 
 void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height,
                                 const unsigned char *pixelsImage)
 {
-#ifdef wxHAS_RAW_BITMAP
     wxRect r = wxRectFromPRectangle(rc);
     wxBitmap bmp = BitmapFromRGBAImage(width, height, pixelsImage);
     hdc->DrawBitmap(bmp, r.x, r.y, true);
-#endif
 }
 
 
@@ -1963,473 +1998,732 @@ PRectangle Window::GetMonitorRect(Point pt) {
     return PRectangleFromwxRect(dpy.GetGeometry());
 }
 
+
 //----------------------------------------------------------------------
-// Helper classes for ListBox
+// wxSTCPopupBase and wxSTCPopupWindow
 
+#ifdef __WXOSX_COCOA__
 
-// This is a simple subclass of wxListView that just resets focus to the
-// parent when it gets it.
-class wxSTCListBox : public wxListView {
-public:
-    wxSTCListBox(wxWindow* parent, wxWindowID id,
-                 const wxPoint& pos, const wxSize& size,
-                 long style)
-        : wxListView()
+    wxSTCPopupBase::wxSTCPopupBase(wxWindow* parent):wxNonOwnedWindow()
     {
-#ifdef __WXMSW__
-        Hide(); // don't flicker as we move it around...
-#endif
-        Create(parent, id, pos, size, style);
+        m_nativeWin = CreateFloatingWindow(this);
+        wxNonOwnedWindow::Create(parent, m_nativeWin);
+        m_stc = wxDynamicCast(parent, wxStyledTextCtrl);
+        m_isShown = false;
+
+        Bind(wxEVT_ENTER_WINDOW, &wxSTCPopupBase::OnMouseEnter, this);
+        Bind(wxEVT_LEAVE_WINDOW, &wxSTCPopupBase::OnMouseLeave, this);
     }
 
-
-    void OnFocus(wxFocusEvent& event) {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-    void OnKillFocus(wxFocusEvent& WXUNUSED(event)) {
-        // Do nothing.  Prevents base class from resetting the colors...
-    }
-
-#ifdef __WXMAC__
-    // For some reason I don't understand yet the focus doesn't really leave
-    // the listbox like it should, so if we get any events feed them back to
-    // the wxSTC
-    void OnKeyDown(wxKeyEvent& event) {
-        GetGrandParent()->GetEventHandler()->ProcessEvent(event);
-    }
-    void OnChar(wxKeyEvent& event) {
-        GetGrandParent()->GetEventHandler()->ProcessEvent(event);
-    }
-
-    // And we need to force the focus back when being destroyed
-    ~wxSTCListBox() {
-        GetGrandParent()->SetFocus();
-    }
-#endif
-
-private:
-    wxDECLARE_EVENT_TABLE();
-};
-
-wxBEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
-    EVT_SET_FOCUS( wxSTCListBox::OnFocus)
-    EVT_KILL_FOCUS(wxSTCListBox::OnKillFocus)
-#ifdef __WXMAC__
-    EVT_KEY_DOWN(  wxSTCListBox::OnKeyDown)
-    EVT_CHAR(      wxSTCListBox::OnChar)
-#endif
-wxEND_EVENT_TABLE()
-
-
-
-#if wxUSE_POPUPWIN //-----------------------------------
-#include "wx/popupwin.h"
-
-// A popup window to place the wxSTCListBox upon
-class wxSTCListBoxWin : public wxPopupWindow
-{
-private:
-    wxListView*         lv;
-    CallBackAction      doubleClickAction;
-    void*               doubleClickActionData;
-public:
-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
-        wxPopupWindow(parent, wxBORDER_SIMPLE)
+    wxSTCPopupBase::~wxSTCPopupBase()
     {
+        UnsubclassWin();
+        CloseFloatingWindow(m_nativeWin);
 
-        lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
-                              wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
-        lv->SetCursor(wxCursor(wxCURSOR_ARROW));
-        lv->InsertColumn(0, wxEmptyString);
-        lv->InsertColumn(1, wxEmptyString);
-
-        // NOTE: We need to fool the wxListView into thinking that it has the
-        // focus so it will use the normal selection colour and will look
-        // "right" to the user.  But since the wxPopupWindow or its children
-        // can't receive focus then we have to pull a fast one and temporarily
-        // parent the listctrl on the STC window and then call SetFocus and
-        // then reparent it back to the popup.
-        lv->SetFocus();
-        lv->Reparent(this);
-#ifdef __WXMSW__
-        lv->Show();
-#endif
-#if defined(__WXOSX_COCOA__) || defined(__WXGTK__)
-        // This color will end up being our border
-        SetBackgroundColour(wxColour(0xC0, 0xC0, 0xC0));
-#endif
+        SetSTCCursor(wxSTC_CURSORNORMAL);
     }
 
+    bool wxSTCPopupBase::Show(bool show)
+    {
+        if ( !wxWindowBase::Show(show) )
+            return false;
 
-    // Set position in client coords
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO) wxOVERRIDE {
-        if (x != wxDefaultCoord) {
-            GetParent()->ClientToScreen(&x, NULL);
+        if ( show )
+        {
+            ShowFloatingWindow(m_nativeWin);
+
+            if ( GetRect().Contains(::wxMouseState().GetPosition()) )
+                SetSTCCursor(wxSTC_CURSORARROW);
         }
-        if (y != wxDefaultCoord) {
-            GetParent()->ClientToScreen(NULL, &y);
+        else
+        {
+            HideFloatingWindow(m_nativeWin);
+            SetSTCCursor(wxSTC_CURSORNORMAL);
         }
-        wxPopupWindow::DoSetSize(x, y, width, height, sizeFlags);
-    }
 
-    // return position as if it were in client coords
-    virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE {
-        int sx, sy;
-        wxPopupWindow::DoGetPosition(&sx, &sy);
-        GetParent()->ScreenToClient(&sx, &sy);
-        if (x) *x = sx;
-        if (y) *y = sy;
-    }
-
-
-    bool Destroy() wxOVERRIDE {
-        if ( !wxPendingDelete.Member(this) )
-            wxPendingDelete.Append(this);
         return true;
     }
 
+    void wxSTCPopupBase::DoSetSize(int x, int y, int width, int ht, int flags)
+    {
+        wxSize oldSize = GetSize();
+        wxNonOwnedWindow::DoSetSize(x, y, width, ht, flags);
 
-    int IconWidth() {
-        wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
-        if (il != NULL) {
-            int w, h;
-            il->GetSize(0, w, h);
-            return w;
+        if ( oldSize != GetSize() )
+            SendSizeEvent();
+    }
+
+    void wxSTCPopupBase::SetSTCCursor(int cursor)
+    {
+        if ( m_stc )
+            m_stc->SetSTCCursor(cursor);
+    }
+
+    void wxSTCPopupBase::OnMouseEnter(wxMouseEvent& WXUNUSED(event))
+    {
+        SetSTCCursor(wxSTC_CURSORARROW);
+    }
+
+    void wxSTCPopupBase::OnMouseLeave(wxMouseEvent& WXUNUSED(event))
+    {
+        SetSTCCursor(wxSTC_CURSORNORMAL);
+    }
+
+#elif wxUSE_POPUPWIN
+
+    wxSTCPopupBase::wxSTCPopupBase(wxWindow* parent)
+                   :wxPopupWindow(parent, wxPU_CONTAINS_CONTROLS)
+    {
+    }
+
+    #ifdef __WXGTK__
+
+        wxSTCPopupBase::~wxSTCPopupBase()
+        {
+            wxRect rect = GetRect();
+            GetParent()->ScreenToClient(&(rect.x), &(rect.y));
+            GetParent()->Refresh(false, &rect);
         }
-        return 0;
-    }
 
+    #elif defined(__WXMSW__)
 
-    void SetDoubleClickAction(CallBackAction action, void *data) {
-        doubleClickAction = action;
-        doubleClickActionData = data;
-    }
+        // Do not activate the window when it is shown.
+        bool wxSTCPopupBase::Show(bool show)
+        {
+            if ( !wxWindowBase::Show(show) )
+                return false;
 
+            if ( show )
+            {
+                HWND hWnd = reinterpret_cast<HWND>(GetHandle());
+                if ( GetName() == "wxSTCCallTip" )
+                    ::AnimateWindow(hWnd, 25, AW_BLEND);
+                else
+                    ::ShowWindow(hWnd, SW_SHOWNA );
 
-    void OnFocus(wxFocusEvent& event) {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
+                ::SetWindowPos(hWnd, HWND_NOTOPMOST, 0, 0, 0, 0,
+                               SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+            }
+            else
+                wxPopupWindow::Show(false);
 
-    void OnSize(wxSizeEvent& event) {
-        // resize the child to fill the popup
-        wxSize sz = GetClientSize();
-        int x, y, w, h;
-        x = y = 0;
-        w = sz.x;
-        h = sz.y;
-#if defined(__WXOSX_COCOA__) || defined(__WXGTK__)
-        // make room for the parent's bg color to show, to act as a border
-        x = y = 1;
-        w -= 2;
-        h -= 2;
-#endif
-        lv->SetSize(x, y, w, h);
-        // reset the column widths
-        lv->SetColumnWidth(0, IconWidth()+4);
-        lv->SetColumnWidth(1, w - 2 - lv->GetColumnWidth(0) -
-                           wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
-        event.Skip();
-    }
+            return true;
+        }
 
-    void OnActivate(wxListEvent& WXUNUSED(event)) {
-        doubleClickAction(doubleClickActionData);
-    }
+        // Do not activate in response to mouse clicks on this window.
+        bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg,
+                                              WXWPARAM wParam, WXLPARAM lParam)
+        {
+            if ( msg == WM_MOUSEACTIVATE )
+            {
+                *res = MA_NOACTIVATE;
+                return true;
+            }
+            else
+                return wxPopupWindow::MSWHandleMessage(res, msg, wParam,lParam);
+        }
 
-    wxListView* GetLB() { return lv; }
+    #endif // __WXGTK__
 
-private:
-    wxDECLARE_EVENT_TABLE();
-
-};
-
-wxBEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
-    EVT_SET_FOCUS          (          wxSTCListBoxWin::OnFocus)
-    EVT_SIZE               (          wxSTCListBoxWin::OnSize)
-    EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
-wxEND_EVENT_TABLE()
-
-
-
-#else // !wxUSE_POPUPWIN -----------------------------------
-#include "wx/frame.h"
-
-// A normal window to place the wxSTCListBox upon, but make it behave as much
-// like a wxPopupWindow as possible
-class wxSTCListBoxWin : public wxFrame {
-private:
-    wxListView*         lv;
-    CallBackAction      doubleClickAction;
-    void*               doubleClickActionData;
-public:
-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
-        wxFrame(parent, id, wxEmptyString, wxPoint(location.x, location.y), wxSize(0,0),
-                wxFRAME_NO_TASKBAR
-                | wxFRAME_FLOAT_ON_PARENT
-#ifdef __WXMAC__
-                | wxPOPUP_WINDOW
-                | wxNO_BORDER
 #else
-                | wxSIMPLE_BORDER
-#endif
-            )
+
+    wxSTCPopupBase::wxSTCPopupBase(wxWindow* parent)
+                   :wxFrame(parent, wxID_ANY, wxEmptyString,
+                            wxDefaultPosition, wxDefaultSize,
+                            wxFRAME_FLOAT_ON_PARENT | wxBORDER_NONE)
     {
-
-        lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
-                              wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
-        lv->SetCursor(wxCursor(wxCURSOR_ARROW));
-        lv->InsertColumn(0, wxEmptyString);
-        lv->InsertColumn(1, wxEmptyString);
-
-        // Eventhough we immediately reset the focus to the parent, this helps
-        // things to look right...
-        lv->SetFocus();
-
-        Hide();
+        #if defined(__WXGTK__)
+            gtk_window_set_accept_focus(GTK_WINDOW(this->GetHandle()), FALSE);
+        #endif
     }
 
+    #ifdef __WXMSW__
 
-    // On OSX and (possibly others) there can still be pending
-    // messages/events for the list control when Scintilla wants to
-    // close it, so do a pending delete of it instead of destroying
-    // immediately.
-    bool Destroy()
+        // Use ShowWithoutActivating instead of show.
+        bool wxSTCPopupBase::Show(bool show) wxOVERRIDE
+        {
+            if ( show )
+            {
+                if ( IsShown() )
+                    return false;
+                else
+                {
+                    ShowWithoutActivating();
+                    return true;
+                }
+            }
+            else
+                return wxFrame::Show(false);
+        }
+
+        // Do not activate in response to mouse clicks on this window.
+        bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg,
+                                              WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
+        {
+            if ( msg == WM_MOUSEACTIVATE )
+            {
+                *res = MA_NOACTIVATE;
+                return true;
+            }
+            else
+                return wxFrame::MSWHandleMessage(res, msg, wParam, lParam);
+        }
+
+    #elif !wxSTC_POPUP_IS_CUSTOM
+
+        void wxSTCPopupBase::ActivateParent()
+        {
+            // Although we're a frame, we always want the parent to be active,
+            // so raise it whenever we get shown, focused, etc.
+            wxTopLevelWindow *frame = wxDynamicCast(
+                wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+            if (frame)
+                frame->Raise();
+        }
+
+        bool wxSTCPopupBase::Show(bool show)
+        {
+            bool rv = wxFrame::Show(show);
+            if (rv && show)
+                ActivateParent();
+
+            #ifdef __WXMAC__
+                GetParent()->Refresh(false);
+            #endif
+        }
+
+    #endif
+
+#endif // __WXOSX_COCOA__
+
+wxSTCPopupWindow::wxSTCPopupWindow(wxWindow* parent)
+                 :wxSTCPopupBase(parent), m_initialPosition(wxDefaultPosition)
+{
+    #if !wxSTC_POPUP_IS_CUSTOM
+        Bind(wxEVT_SET_FOCUS, &wxSTCPopupWindow::OnFocus, this);
+    #endif
+
+    m_tlw = wxDynamicCast(wxGetTopLevelParent(parent), wxTopLevelWindow);
+    if ( m_tlw )
     {
-#ifdef __WXMAC__
+        m_tlw->Bind(wxEVT_MOVE, &wxSTCPopupWindow::OnParentMove, this);
+    #if defined(__WXOSX_COCOA__) || (defined(__WXGTK__)&&!wxSTC_POPUP_IS_FRAME)
+        m_tlw->Bind(wxEVT_ICONIZE, &wxSTCPopupWindow::OnIconize, this);
+    #endif
+    }
+}
+
+wxSTCPopupWindow::~wxSTCPopupWindow()
+{
+    if ( m_tlw )
+    {
+        m_tlw->Unbind(wxEVT_MOVE, &wxSTCPopupWindow::OnParentMove, this);
+    #if defined(__WXOSX_COCOA__) || (defined(__WXGTK__)&&!wxSTC_POPUP_IS_FRAME)
+        m_tlw->Unbind(wxEVT_ICONIZE, &wxSTCPopupWindow::OnIconize, this);
+    #endif
+    }
+}
+
+bool wxSTCPopupWindow::Destroy()
+{
+    #if defined(__WXMAC__) && wxSTC_POPUP_IS_FRAME && !wxSTC_POPUP_IS_CUSTOM
         // The bottom edge of this window is not getting properly
         // refreshed upon deletion, so help it out...
         wxWindow* p = GetParent();
         wxRect r(GetPosition(), GetSize());
         r.SetHeight(r.GetHeight()+1);
         p->Refresh(false, &r);
-#endif
-        if ( !wxPendingDelete.Member(this) )
-            wxPendingDelete.Append(this);
-        return true;
+    #endif
+
+    if ( !wxPendingDelete.Member(this) )
+        wxPendingDelete.Append(this);
+
+    return true;
+}
+
+bool wxSTCPopupWindow::AcceptsFocus() const
+{
+    return false;
+}
+
+void wxSTCPopupWindow::DoSetSize(int x, int y, int width, int height, int flags)
+{
+    if ( m_initialPosition == wxDefaultPosition
+            && x != wxDefaultCoord && y != wxDefaultCoord )
+        m_initialPosition = wxPoint(x, y);
+
+    // convert coords to screen coords since we're a top-level window
+    if (x != wxDefaultCoord)
+        GetParent()->ClientToScreen(&x, NULL);
+
+    if (y != wxDefaultCoord)
+        GetParent()->ClientToScreen(NULL, &y);
+
+    wxSTCPopupBase::DoSetSize(x, y, width, height, flags);
+}
+
+void wxSTCPopupWindow::OnParentMove(wxMoveEvent& event)
+{
+    if ( m_initialPosition != wxDefaultPosition )
+        SetPosition(m_initialPosition);
+    event.Skip();
+}
+
+#if defined(__WXOSX_COCOA__) || (defined(__WXGTK__) && !wxSTC_POPUP_IS_FRAME)
+
+    void wxSTCPopupWindow::OnIconize(wxIconizeEvent& event)
+    {
+        Show(!event.IsIconized());
     }
 
+#elif !wxSTC_POPUP_IS_CUSTOM
 
-    int IconWidth()
+    void wxSTCPopupWindow::OnFocus(wxFocusEvent& event)
     {
-        wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
-        if (il != NULL) {
-            int w, h;
-            il->GetSize(0, w, h);
-            return w;
-        }
-        return 0;
-    }
+        #if wxSTC_POPUP_IS_FRAME
+            ActivateParent();
+        #endif
 
-
-    void SetDoubleClickAction(CallBackAction action, void *data)
-    {
-        doubleClickAction = action;
-        doubleClickActionData = data;
-    }
-
-
-    void OnFocus(wxFocusEvent& event)
-    {
-        ActivateParent();
         GetParent()->SetFocus();
         event.Skip();
     }
 
-    void OnSize(wxSizeEvent& event)
-    {
-        // resize the child
-        wxSize sz = GetClientSize();
-        lv->SetSize(sz);
-        // reset the column widths
-        lv->SetColumnWidth(0, IconWidth()+4);
-        lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
-                           wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
-        event.Skip();
-    }
+#endif // __WXOSX_COCOA__
 
-    void ActivateParent()
-    {
-        // Although we're a frame, we always want the parent to be active, so
-        // raise it whenever we get shown, focused, etc.
-        wxTopLevelWindow *frame = wxDynamicCast(
-            wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-        if (frame)
-            frame->Raise();
-    }
-
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO)
-    {
-        // convert coords to screen coords since we're a top-level window
-        if (x != wxDefaultCoord) {
-            GetParent()->ClientToScreen(&x, NULL);
-        }
-        if (y != wxDefaultCoord) {
-            GetParent()->ClientToScreen(NULL, &y);
-        }
-        wxFrame::DoSetSize(x, y, width, height, sizeFlags);
-    }
-
-    virtual bool Show(bool show = true)
-    {
-        bool rv = wxFrame::Show(show);
-        if (rv && show)
-            ActivateParent();
-#ifdef __WXMAC__
-        GetParent()->Refresh(false);
-#endif
-        return rv;
-    }
-
-    void OnActivate(wxListEvent& WXUNUSED(event))
-    {
-        doubleClickAction(doubleClickActionData);
-    }
-
-    wxListView* GetLB() { return lv; }
-
-private:
-    wxDECLARE_EVENT_TABLE();
-};
-
-
-wxBEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
-    EVT_SET_FOCUS          (          wxSTCListBoxWin::OnFocus)
-    EVT_SIZE               (          wxSTCListBoxWin::OnSize)
-    EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
-wxEND_EVENT_TABLE()
-
-#endif // wxUSE_POPUPWIN -----------------------------------
-
-
-inline wxSTCListBoxWin* GETLBW(WindowID win) {
-    return ((wxSTCListBoxWin*)win);
-}
-
-inline wxListView* GETLB(WindowID win) {
-    return GETLBW(win)->GetLB();
-}
 
 //----------------------------------------------------------------------
+// Helper classes for ListBox
 
-class ListBoxImpl : public ListBox {
-private:
-    int                 lineHeight;
-    bool                unicodeMode;
-    int                 desiredVisibleRows;
-    int                 aveCharWidth;
-    size_t              maxStrWidth;
-    Point               location;       // Caret location at which the list is opened
-    wxImageList*        imgList;
-    wxArrayInt*         imgTypeMap;
-
+// The class manages the colours, images, and other data needed for popup lists.
+class wxSTCListBoxVisualData
+{
 public:
-    ListBoxImpl();
-    ~ListBoxImpl();
-    static ListBox *Allocate();
+    wxSTCListBoxVisualData(int d);
+    virtual ~wxSTCListBoxVisualData();
 
-    virtual void SetFont(Font &font) wxOVERRIDE;
-    virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_) wxOVERRIDE;
-    virtual void SetAverageCharWidth(int width) wxOVERRIDE;
-    virtual void SetVisibleRows(int rows) wxOVERRIDE;
-    virtual int GetVisibleRows() const wxOVERRIDE;
-    virtual PRectangle GetDesiredRect() wxOVERRIDE;
-    virtual int CaretFromEdge() wxOVERRIDE;
-    virtual void Clear() wxOVERRIDE;
-    virtual void Append(char *s, int type = -1) wxOVERRIDE;
-            void Append(const wxString& text, int type);
-    virtual int Length() wxOVERRIDE;
-    virtual void Select(int n) wxOVERRIDE;
-    virtual int GetSelection() wxOVERRIDE;
-    virtual int Find(const char *prefix) wxOVERRIDE;
-    virtual void GetValue(int n, char *value, int len) wxOVERRIDE;
-    virtual void RegisterImage(int type, const char *xpm_data) wxOVERRIDE;
-            void RegisterImageHelper(int type, wxBitmap& bmp);
-    virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) wxOVERRIDE;
-    virtual void ClearRegisteredImages() wxOVERRIDE;
-    virtual void SetDoubleClickAction(CallBackAction, void *) wxOVERRIDE;
-    virtual void SetList(const char* list, char separator, char typesep) wxOVERRIDE;
+    // ListBoxImpl implementation
+    void SetDesiredVisibleRows(int d);
+    int  GetDesiredVisibleRows() const;
+    void RegisterImage(int type, const wxBitmap& bmp);
+    void RegisterImage(int, const char *);
+    void RegisterRGBAImage(int, int, int,const unsigned char *);
+    void ClearRegisteredImages();
+
+    // Image data
+    const wxBitmap* GetImage(int i) const;
+
+    // Colour data
+    void ComputeColours();
+    const wxColour& GetBorderColour() const;
+    void SetColours(const wxColour&, const wxColour&,
+                    const wxColour&,const wxColour&);
+    const wxColour& GetBgColour() const;
+    const wxColour& GetTextColour() const;
+    const wxColour& GetHighlightBgColour() const;
+    const wxColour& GetHighlightTextColour() const;
+
+    // ListCtrl Style
+    void UseListCtrlStyle(bool, const wxColour&, const wxColour&);
+    bool HasListCtrlAppearance() const;
+    const wxColour& GetCurrentBgColour() const;
+    const wxColour& GetCurrentTextColour() const;
+
+private:
+    WX_DECLARE_HASH_MAP(int, wxBitmap, wxIntegerHash, wxIntegerEqual, ImgList);
+
+    int      m_desiredVisibleRows;
+    ImgList  m_imgList;
+
+    wxColour m_borderColour;
+    wxColour m_bgColour;
+    wxColour m_textColour;
+    wxColour m_highlightBgColour;
+    wxColour m_highlightTextColour;
+    bool     m_useDefaultBgColour;
+    bool     m_useDefaultTextColour;
+    bool     m_useDefaultHighlightBgColour;
+    bool     m_useDefaultHighlightTextColour;
+
+    bool     m_hasListCtrlAppearance;
+    wxColour m_currentBgColour;
+    wxColour m_currentTextColour;
+    bool     m_useDefaultCurrentBgColour;
+    bool     m_useDefaultCurrentTextColour;
 };
 
+wxSTCListBoxVisualData::wxSTCListBoxVisualData(int d):m_desiredVisibleRows(d),
+                        m_useDefaultBgColour(true),
+                        m_useDefaultTextColour(true),
+                        m_useDefaultHighlightBgColour(true),
+                        m_useDefaultHighlightTextColour(true),
+                        m_hasListCtrlAppearance(false),
+                        m_useDefaultCurrentBgColour(true),
+                        m_useDefaultCurrentTextColour(true)
+{
+    ComputeColours();
+}
 
-ListBoxImpl::ListBoxImpl()
-    : lineHeight(10), unicodeMode(false),
-      desiredVisibleRows(5), aveCharWidth(8), maxStrWidth(0),
-      imgList(NULL), imgTypeMap(NULL)
+wxSTCListBoxVisualData::~wxSTCListBoxVisualData()
+{
+    m_imgList.clear();
+}
+
+void wxSTCListBoxVisualData::SetDesiredVisibleRows(int d)
+{
+    m_desiredVisibleRows=d;
+}
+
+int wxSTCListBoxVisualData::GetDesiredVisibleRows() const
+{
+    return m_desiredVisibleRows;
+}
+
+void wxSTCListBoxVisualData::RegisterImage(int type, const wxBitmap& bmp)
+{
+    if ( !bmp.IsOk() )
+        return;
+
+    ImgList::iterator it=m_imgList.find(type);
+    if ( it != m_imgList.end() )
+        m_imgList.erase(it);
+
+    m_imgList[type] = bmp;
+}
+
+void wxSTCListBoxVisualData::RegisterImage(int type, const char *xpm_data)
+{
+    wxXPMDecoder dec;
+    wxImage img;
+
+    // This check is borrowed from src/stc/scintilla/src/XPM.cpp.
+    // Test done is two parts to avoid possibility of overstepping the memory
+    // if memcmp implemented strangely. Must be 4 bytes at least at destination.
+    if ( (0 == memcmp(xpm_data, "/* X", 4)) &&
+         (0 == memcmp(xpm_data, "/* XPM */", 9)) )
+    {
+        wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
+        img = dec.ReadFile(stream);
+    }
+    else
+        img = dec.ReadData(reinterpret_cast<const char* const*>(xpm_data));
+
+    wxBitmap bmp(img);
+    RegisterImage(type, bmp);
+}
+
+void wxSTCListBoxVisualData::RegisterRGBAImage(int type, int width, int height,
+                                    const unsigned char *pixelsImage)
+{
+    wxBitmap bmp = BitmapFromRGBAImage(width, height, pixelsImage);
+    RegisterImage(type, bmp);
+}
+
+void wxSTCListBoxVisualData::ClearRegisteredImages()
+{
+    m_imgList.clear();
+}
+
+const wxBitmap* wxSTCListBoxVisualData::GetImage(int i) const
+{
+    ImgList::const_iterator it = m_imgList.find(i);
+
+    if ( it != m_imgList.end() )
+        return &(it->second);
+    else
+        return NULL;
+}
+
+void wxSTCListBoxVisualData::ComputeColours()
+{
+    // wxSYS_COLOUR_BTNSHADOW seems to be the closest match with most themes.
+    m_borderColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW );
+
+    if ( m_useDefaultBgColour )
+        m_bgColour = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
+
+    if ( m_useDefaultTextColour )
+        m_textColour = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
+
+    if ( m_hasListCtrlAppearance )
+    {
+        // If m_highlightBgColour and/or m_currentBgColour are not
+        // explicitly set, set them to wxNullColour to indicate that they
+        // should be drawn with wxRendererNative.
+        if ( m_useDefaultHighlightBgColour )
+            m_highlightBgColour = wxNullColour;
+
+        if ( m_useDefaultCurrentBgColour )
+            m_currentBgColour = wxNullColour;
+
+        #ifdef __WXMSW__
+            if ( m_useDefaultHighlightTextColour )
+                m_highlightTextColour =
+                    wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
+        #else
+            if ( m_useDefaultHighlightTextColour )
+                m_highlightTextColour = wxSystemSettings::GetColour(
+                    wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
+        #endif
+
+        if ( m_useDefaultCurrentTextColour )
+            m_currentTextColour = wxSystemSettings::GetColour(
+                wxSYS_COLOUR_LISTBOXTEXT);
+    }
+    else
+    {
+    #ifdef __WXOSX_COCOA__
+        if ( m_useDefaultHighlightBgColour )
+            m_highlightBgColour = GetListHighlightColour();
+    #else
+        if ( m_useDefaultHighlightBgColour )
+            m_highlightBgColour =
+                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+    #endif
+
+        if ( m_useDefaultHighlightTextColour )
+            m_highlightTextColour =
+                wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
+    }
+}
+
+static void SetColourHelper(bool& isDefault, wxColour& itemColour,
+                            const wxColour& newColour)
+{
+    isDefault = !newColour.IsOk();
+    itemColour = newColour;
+}
+
+void wxSTCListBoxVisualData::SetColours(const wxColour& bg,
+                                        const wxColour& txt,
+                                        const wxColour& hlbg,
+                                        const wxColour& hltext)
+{
+    SetColourHelper(m_useDefaultBgColour, m_bgColour, bg);
+    SetColourHelper(m_useDefaultTextColour, m_textColour, txt);
+    SetColourHelper(m_useDefaultHighlightBgColour, m_highlightBgColour, hlbg);
+    SetColourHelper(m_useDefaultHighlightTextColour, m_highlightTextColour,
+                    hltext);
+    ComputeColours();
+}
+
+const wxColour& wxSTCListBoxVisualData::GetBorderColour() const
+{
+    return m_borderColour;
+}
+
+const wxColour& wxSTCListBoxVisualData::GetBgColour() const
+{
+    return m_bgColour;
+}
+
+const wxColour& wxSTCListBoxVisualData::GetTextColour() const
+{
+    return m_textColour;
+}
+
+const wxColour& wxSTCListBoxVisualData::GetHighlightBgColour() const
+{
+    return m_highlightBgColour;
+}
+
+const wxColour& wxSTCListBoxVisualData::GetHighlightTextColour() const
+{
+    return m_highlightTextColour;
+}
+
+void wxSTCListBoxVisualData::UseListCtrlStyle(bool useListCtrlStyle,
+                                              const wxColour& curBg,
+                                              const wxColour& curText)
+{
+    m_hasListCtrlAppearance = useListCtrlStyle;
+    SetColourHelper(m_useDefaultCurrentBgColour, m_currentBgColour, curBg);
+    SetColourHelper(m_useDefaultCurrentTextColour, m_currentTextColour,
+                    curText);
+    ComputeColours();
+}
+
+bool wxSTCListBoxVisualData::HasListCtrlAppearance() const
+{
+    return m_hasListCtrlAppearance;
+}
+
+const wxColour& wxSTCListBoxVisualData::GetCurrentBgColour() const
+{
+    return m_currentBgColour;
+}
+
+const wxColour& wxSTCListBoxVisualData::GetCurrentTextColour() const
+{
+    return m_currentTextColour;
+}
+
+// The class is intended to look like a standard listbox (with an optional
+// icon). However, it needs to look like it has focus even when it doesn't.
+class wxSTCListBox : public wxSystemThemedControl<wxVListBox>
+{
+public:
+    wxSTCListBox(wxWindow*, wxSTCListBoxVisualData*, int);
+
+    // wxWindow overrides
+    virtual bool AcceptsFocus() const wxOVERRIDE;
+    virtual void SetFocus() wxOVERRIDE;
+
+    // Setters
+    void SetContainerBorderSize(int);
+
+    // ListBoxImpl implementation
+    void SetListBoxFont(Font &font);
+    void SetAverageCharWidth(int width);
+    PRectangle GetDesiredRect() const;
+    int CaretFromEdge() const;
+    void Clear();
+    void Append(char *s, int type = -1);
+    int Length() const;
+    void Select(int n);
+    void GetValue(int n, char *value, int len) const;
+    void SetDoubleClickAction(CallBackAction, void *);
+    void SetList(const char* list, char separator, char typesep);
+
+protected:
+    // Helpers
+    void AppendHelper(const wxString& text, int type);
+    void AccountForBitmap(int type, bool recalculateItemHeight);
+    void RecalculateItemHeight();
+    int TextBoxFromClientEdge() const;
+
+    // Event handlers
+    void OnDClick(wxCommandEvent&);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnMouseMotion(wxMouseEvent& event);
+    void OnMouseLeaveWindow(wxMouseEvent& event);
+
+    // wxVListBox overrides
+    virtual wxCoord OnMeasureItem(size_t) const wxOVERRIDE;
+    virtual void OnDrawItem(wxDC& , const wxRect &, size_t) const wxOVERRIDE;
+    virtual void OnDrawBackground(wxDC&, const wxRect&,size_t) const wxOVERRIDE;
+
+private:
+    WX_DECLARE_HASH_SET(int, wxIntegerHash, wxIntegerEqual, SetOfInts);
+
+    wxSTCListBoxVisualData* m_visualData;
+    wxVector<wxString>      m_labels;
+    wxVector<int>           m_imageNos;
+    size_t                  m_maxStrWidth;
+    int                     m_currentRow;
+
+    CallBackAction          m_doubleClickAction;
+    void*                   m_doubleClickActionData;
+    int                     m_aveCharWidth;
+
+    // These drawing parameters are computed or set externally.
+    int m_borderSize;
+    int m_textHeight;
+    int m_itemHeight;
+    int m_textTopGap;
+    int m_imageAreaWidth;
+    int m_imageAreaHeight;
+
+    // These drawing parameters are set internally and can be changed if needed
+    // to better match the appearance of a list box on a specific platform.
+    int m_imagePadding;
+    int m_textBoxToTextGap;
+    int m_textExtraVerticalPadding;
+};
+
+wxSTCListBox::wxSTCListBox(wxWindow* parent, wxSTCListBoxVisualData* v, int ht)
+             :wxSystemThemedControl<wxVListBox>(),
+              m_visualData(v), m_maxStrWidth(0), m_currentRow(wxNOT_FOUND),
+              m_doubleClickAction(NULL), m_doubleClickActionData(NULL),
+              m_aveCharWidth(8), m_textHeight(ht), m_itemHeight(ht),
+              m_textTopGap(0), m_imageAreaWidth(0), m_imageAreaHeight(0)
+{
+    wxVListBox::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                       wxBORDER_NONE);
+
+    m_imagePadding             = FromDIP(1);
+    m_textBoxToTextGap         = FromDIP(3);
+    m_textExtraVerticalPadding = FromDIP(1);
+
+    SetBackgroundColour(m_visualData->GetBgColour());
+
+    Bind(wxEVT_LISTBOX_DCLICK, &wxSTCListBox::OnDClick, this);
+    Bind(wxEVT_SYS_COLOUR_CHANGED, &wxSTCListBox::OnSysColourChanged, this);
+
+    if ( m_visualData->HasListCtrlAppearance() )
+    {
+        EnableSystemTheme();
+        Bind(wxEVT_MOTION, &wxSTCListBox::OnMouseMotion, this);
+        Bind(wxEVT_LEAVE_WINDOW, &wxSTCListBox::OnMouseLeaveWindow, this);
+
+        #ifdef __WXMSW__
+            // On MSW when using wxRendererNative to draw items in list control
+            // style, the colours used seem to be based on the parent's
+            // background colour. So set the popup's background.
+            parent->SetOwnBackgroundColour(m_visualData->GetBgColour());
+        #endif
+    }
+}
+
+bool wxSTCListBox::AcceptsFocus() const
+{
+    return false;
+}
+
+// Do nothing in response to an attempt to set focus.
+void wxSTCListBox::SetFocus()
 {
 }
 
-ListBoxImpl::~ListBoxImpl() {
-    wxDELETE(imgList);
-    wxDELETE(imgTypeMap);
+void wxSTCListBox::SetContainerBorderSize(int s)
+{
+    m_borderSize = s;
 }
 
-
-void ListBoxImpl::SetFont(Font &font) {
-    GETLB(wid)->SetFont(*((wxFont*)font.GetID()));
+void wxSTCListBox::SetListBoxFont(Font &font)
+{
+    SetFont(*((wxFont*)font.GetID()));
+    int w;
+    GetTextExtent(EXTENT_TEST, &w, &m_textHeight);
+    RecalculateItemHeight();
 }
 
-
-void ListBoxImpl::Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int WXUNUSED(technology_)) {
-    location = location_;
-    lineHeight =  lineHeight_;
-    unicodeMode = unicodeMode_;
-    maxStrWidth = 0;
-    wid = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID, location);
-    if (imgList != NULL)
-        GETLB(wid)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
+void wxSTCListBox::SetAverageCharWidth(int width)
+{
+    m_aveCharWidth = width;
 }
 
-
-void ListBoxImpl::SetAverageCharWidth(int width) {
-    aveCharWidth = width;
-}
-
-
-void ListBoxImpl::SetVisibleRows(int rows) {
-    desiredVisibleRows = rows;
-}
-
-
-int ListBoxImpl::GetVisibleRows() const {
-    return desiredVisibleRows;
-}
-
-PRectangle ListBoxImpl::GetDesiredRect() {
-    // wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of
-    // the max size in Append and calculate it here...
-    int maxw = maxStrWidth * aveCharWidth;
+PRectangle wxSTCListBox::GetDesiredRect() const
+{
+    int maxw = m_maxStrWidth * m_aveCharWidth;
     int maxh ;
 
     // give it a default if there are no lines, and/or add a bit more
     if (maxw == 0) maxw = 100;
-    maxw += aveCharWidth * 3 +
-            GETLBW(wid)->IconWidth() + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+    maxw += TextBoxFromClientEdge() + m_textBoxToTextGap + m_aveCharWidth * 3;
     if (maxw > 350)
         maxw = 350;
 
     // estimate a desired height
-    int count = GETLB(wid)->GetItemCount();
-    if (count) {
-        wxRect rect;
-        GETLB(wid)->GetItemRect(0, rect);
-        maxh = count * rect.GetHeight();
-        if (maxh > 140)  // TODO:  Use desiredVisibleRows??
-            maxh = 140;
-
-        // Try to make the size an exact multiple of some number of lines
-        int lines = maxh / rect.GetHeight();
-        maxh = (lines + 1) * rect.GetHeight() + 2;
+    const int count = Length();
+    const int desiredVisibleRows = m_visualData->GetDesiredVisibleRows();
+    if ( count )
+    {
+        if ( count <= desiredVisibleRows )
+            maxh = count * m_itemHeight;
+        else
+            maxh = desiredVisibleRows * m_itemHeight;
     }
     else
         maxh = 100;
 
+    // Add space for a scrollbar if needed.
+    if ( count > desiredVisibleRows )
+        maxw += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+
+    // Add borders.
+    maxw += 2 * m_borderSize;
+    maxh += 2 * m_borderSize;
+
     PRectangle rc;
     rc.top = 0;
     rc.left = 0;
@@ -2438,37 +2732,52 @@ PRectangle ListBoxImpl::GetDesiredRect() {
     return rc;
 }
 
-
-int ListBoxImpl::CaretFromEdge() {
-    return 4 + GETLBW(wid)->IconWidth();
+int wxSTCListBox::CaretFromEdge() const
+{
+    return m_borderSize + TextBoxFromClientEdge() + m_textBoxToTextGap;
 }
 
-
-void ListBoxImpl::Clear() {
-    GETLB(wid)->DeleteAllItems();
+void wxSTCListBox::Clear()
+{
+    m_imageAreaWidth = 0;
+    m_imageAreaHeight = 0;
+    m_labels.clear();
+    m_imageNos.clear();
 }
 
-
-void ListBoxImpl::Append(char *s, int type) {
-    Append(stc2wx(s), type);
+void wxSTCListBox::Append(char *s, int type)
+{
+    AppendHelper(stc2wx(s), type);
+    AccountForBitmap(type, true);
 }
 
-void ListBoxImpl::Append(const wxString& text, int type) {
-    long count  = GETLB(wid)->GetItemCount();
-    long itemID  = GETLB(wid)->InsertItem(count, wxEmptyString);
-    long idx = -1;
-    GETLB(wid)->SetItem(itemID, 1, text);
-    maxStrWidth = wxMax(maxStrWidth, text.length());
-    if (type != -1) {
-        wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
-        idx = imgTypeMap->Item(type);
-    }
-    GETLB(wid)->SetItemImage(itemID, idx, idx);
+int wxSTCListBox::Length() const
+{
+    return GetItemCount();
 }
 
-void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
-    GETLB(wid)->Freeze();
+void wxSTCListBox::Select(int n)
+{
+    SetSelection(n);
+}
+
+void wxSTCListBox::GetValue(int n, char *value, int len) const
+{
+    strncpy(value, wx2stc(m_labels[n]), len);
+    value[len-1] = '\0';
+}
+
+void wxSTCListBox::SetDoubleClickAction(CallBackAction action, void *data)
+{
+    m_doubleClickAction = action;
+    m_doubleClickActionData = data;
+}
+
+void wxSTCListBox::SetList(const char* list, char separator, char typesep)
+{
+    wxWindowUpdateLocker noUpdates(this);
     Clear();
+    SetOfInts bitmapNos;
     wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
     while ( tkzr.HasMoreTokens() ) {
         wxString token = tkzr.GetNextToken();
@@ -2478,30 +2787,342 @@ void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
             token.Mid(pos+1).ToLong(&type);
             token.Truncate(pos);
         }
-        Append(token, (int)type);
+        AppendHelper(token, (int)type);
+        bitmapNos.insert(static_cast<int>(type));
     }
-    GETLB(wid)->Thaw();
+
+    for ( SetOfInts::iterator it=bitmapNos.begin(); it!=bitmapNos.end(); ++it )
+        AccountForBitmap(*it, false);
+
+    if ( m_imageAreaHeight > 0 )
+        RecalculateItemHeight();
+}
+
+void wxSTCListBox::AppendHelper(const wxString& text, int type)
+{
+    m_maxStrWidth = wxMax(m_maxStrWidth, text.length());
+    m_labels.push_back(text);
+    m_imageNos.push_back(type);
+    SetItemCount(m_labels.size());
+}
+
+void wxSTCListBox::AccountForBitmap(int type, bool recalculateItemHeight)
+{
+    const int oldHeight = m_imageAreaHeight;
+    const wxBitmap* bmp = m_visualData->GetImage(type);
+
+    if ( bmp )
+    {
+        if ( bmp->GetWidth() > m_imageAreaWidth )
+            m_imageAreaWidth = bmp->GetWidth();
+
+        if ( bmp->GetHeight() > m_imageAreaHeight )
+            m_imageAreaHeight = bmp->GetHeight();
+    }
+
+    if ( recalculateItemHeight && m_imageAreaHeight != oldHeight )
+        RecalculateItemHeight();
+}
+
+void wxSTCListBox::RecalculateItemHeight()
+{
+    m_itemHeight = wxMax(m_textHeight + 2 * m_textExtraVerticalPadding,
+                         m_imageAreaHeight + 2 * m_imagePadding);
+    m_textTopGap = (m_itemHeight - m_textHeight)/2;
+}
+
+int wxSTCListBox::TextBoxFromClientEdge() const
+{
+    return (m_imageAreaWidth == 0 ? 0 : m_imageAreaWidth + 2 * m_imagePadding);
+}
+
+void wxSTCListBox::OnDClick(wxCommandEvent& WXUNUSED(event))
+{
+    if ( m_doubleClickAction )
+        m_doubleClickAction(m_doubleClickActionData);
+}
+
+void wxSTCListBox::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+{
+    m_visualData->ComputeColours();
+    GetParent()->SetOwnBackgroundColour(m_visualData->GetBgColour());
+    SetBackgroundColour(m_visualData->GetBgColour());
+    GetParent()->Refresh();
+}
+
+void wxSTCListBox::OnMouseLeaveWindow(wxMouseEvent& event)
+{
+    const int old = m_currentRow;
+    m_currentRow = wxNOT_FOUND;
+
+    if ( old != wxNOT_FOUND )
+        RefreshRow(old);
+
+    event.Skip();
+}
+
+void wxSTCListBox::OnMouseMotion(wxMouseEvent& event)
+{
+    const int old = m_currentRow;
+    m_currentRow = VirtualHitTest(event.GetY());
+
+    if ( old != m_currentRow )
+    {
+        if( m_currentRow != wxNOT_FOUND )
+            RefreshRow(m_currentRow);
+
+        if( old != wxNOT_FOUND )
+            RefreshRow(old);
+    }
+
+    event.Skip();
+}
+
+wxCoord wxSTCListBox::OnMeasureItem(size_t WXUNUSED(n)) const
+{
+    return static_cast<wxCoord>(m_itemHeight);
+}
+
+// This control will be drawn so that a typical row of pixels looks like:
+//
+//    +++++++++++++++++++++++++   =====ITEM TEXT================
+//  |         |                 |    |
+//  |       m_imageAreaWidth    |    |
+//  |                           |    |
+// m_imagePadding               |   m_textBoxToTextGap
+//                              |
+//                   m_imagePadding
+//
+//
+// m_imagePadding            : Used to give a little extra space between the
+//                             client edge and an item's bitmap.
+// m_imageAreaWidth          : Computed as the width of the largest registered
+//                             bitmap.
+// m_textBoxToTextGap        : Used so that item text does not begin immediately
+//                             at the edge of the highlight box.
+//
+// Images are drawn centered in the image area.
+// If a selection rectangle is drawn, its left edge is at x=0 if there are
+// no bitmaps. Otherwise
+//       x = m_imagePadding + m_imageAreaWidth + m_imagePadding.
+// Text is drawn at x + m_textBoxToTextGap and centered vertically.
+
+void wxSTCListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
+{
+    wxString label;
+    int imageNo = -1;
+    if ( n < m_labels.size() )
+    {
+        label   = m_labels[n];
+        imageNo = m_imageNos[n];
+    }
+
+    int topGap = m_textTopGap;
+    int leftGap = TextBoxFromClientEdge() + m_textBoxToTextGap;
+
+    wxDCTextColourChanger tcc(dc);
+
+    if ( IsSelected(n) )
+        tcc.Set(m_visualData->GetHighlightTextColour());
+    else if ( static_cast<int>(n) == m_currentRow )
+        tcc.Set(m_visualData->GetCurrentTextColour());
+    else
+        tcc.Set(m_visualData->GetTextColour());
+
+    label = wxControl::Ellipsize(label, dc, wxELLIPSIZE_END,
+                                 rect.GetWidth() - leftGap);
+    dc.DrawText(label, rect.GetLeft() + leftGap, rect.GetTop() + topGap);
+
+    const wxBitmap* b = m_visualData->GetImage(imageNo);
+    if ( b )
+    {
+        topGap = (m_itemHeight - b->GetHeight())/2;
+        leftGap = m_imagePadding + (m_imageAreaWidth - b->GetWidth())/2;
+        dc.DrawBitmap(*b, rect.GetLeft()+leftGap, rect.GetTop()+topGap, true);
+    }
+}
+
+void wxSTCListBox::OnDrawBackground(wxDC &dc, const wxRect &rect,size_t n) const
+{
+    if ( IsSelected(n) )
+    {
+        wxRect selectionRect(rect);
+        const wxColour& highlightBgColour =m_visualData->GetHighlightBgColour();
+
+        #ifdef __WXMSW__
+            if ( !m_visualData->HasListCtrlAppearance() )
+            {
+                // On windows the selection rectangle in Scintilla's
+                // autocompletion list only covers the text and not the icon.
+
+                const int textBoxFromClientEdge = TextBoxFromClientEdge();
+                selectionRect.SetLeft(rect.GetLeft() + textBoxFromClientEdge);
+                selectionRect.SetWidth(rect.GetWidth() - textBoxFromClientEdge);
+            }
+        #endif // __WXMSW__
+
+        if ( highlightBgColour.IsOk() )
+        {
+            wxDCBrushChanger bc(dc, highlightBgColour);
+            wxDCPenChanger   pc(dc, highlightBgColour);
+            dc.DrawRectangle(selectionRect);
+        }
+        else
+        {
+            wxRendererNative::GetDefault().DrawItemSelectionRect(
+                const_cast<wxSTCListBox*>(this), dc, selectionRect,
+                wxCONTROL_SELECTED | wxCONTROL_FOCUSED);
+        }
+
+        if ( !m_visualData->HasListCtrlAppearance() )
+            wxRendererNative::GetDefault().DrawFocusRect(
+                const_cast<wxSTCListBox*>(this), dc, selectionRect);
+    }
+    else if ( static_cast<int>(n) == m_currentRow )
+    {
+        const wxColour& currentBgColour = m_visualData->GetCurrentBgColour();
+
+        if ( currentBgColour.IsOk() )
+        {
+            wxDCBrushChanger bc(dc, currentBgColour);
+            wxDCPenChanger   pc(dc, currentBgColour);
+            dc.DrawRectangle(rect);
+        }
+        else
+        {
+            wxRendererNative::GetDefault().DrawItemSelectionRect(
+                const_cast<wxSTCListBox*>(this), dc, rect,
+                wxCONTROL_CURRENT | wxCONTROL_FOCUSED);
+        }
+    }
+}
+
+
+// A popup window to place the wxSTCListBox upon
+class wxSTCListBoxWin : public wxSTCPopupWindow
+{
+public:
+    wxSTCListBoxWin(wxWindow*, wxSTCListBox**, wxSTCListBoxVisualData*, int);
+
+protected:
+    void OnPaint(wxPaintEvent&);
+
+private:
+    wxSTCListBoxVisualData* m_visualData;
+};
+
+wxSTCListBoxWin::wxSTCListBoxWin(wxWindow* parent, wxSTCListBox** lb,
+                                 wxSTCListBoxVisualData* v, int h)
+                :wxSTCPopupWindow(parent)
+{
+    *lb = new wxSTCListBox(this, v, h);
+
+    // Use the background of this window to form a frame around the listbox
+    // except on macos where the native Scintilla popup has no frame.
+#ifdef __WXOSX_COCOA__
+    const int borderThickness = 0;
+#else
+    const int borderThickness = FromDIP(1);
+#endif
+    wxBoxSizer* bSizer = new wxBoxSizer(wxVERTICAL);
+    bSizer->Add(*lb, 1, wxEXPAND|wxALL, borderThickness);
+    SetSizer(bSizer);
+    (*lb)->SetContainerBorderSize(borderThickness);
+
+    // When drawing highlighting in listctrl style with wxRendererNative on MSW,
+    // the colours used seem to be based on the background of the parent window.
+    // So manually paint this window to give it the border colour instead of
+    // setting the background colour.
+    m_visualData = v;
+    Bind(wxEVT_PAINT, &wxSTCListBoxWin::OnPaint, this);
+    SetBackgroundStyle(wxBG_STYLE_PAINT);
+}
+
+void wxSTCListBoxWin::OnPaint(wxPaintEvent& WXUNUSED(evt))
+{
+    wxPaintDC dc(this);
+    dc.SetBackground(m_visualData->GetBorderColour());
+    dc.Clear();
+}
+
+
+//----------------------------------------------------------------------
+
+ListBoxImpl::ListBoxImpl()
+            :m_listBox(NULL), m_visualData(new wxSTCListBoxVisualData(5))
+{
+}
+
+ListBoxImpl::~ListBoxImpl() {
+    delete m_visualData;
+}
+
+
+void ListBoxImpl::SetFont(Font &font) {
+    m_listBox->SetListBoxFont(font);
+}
+
+
+void ListBoxImpl::Create(Window &parent, int WXUNUSED(ctrlID),
+                         Point WXUNUSED(location_), int lineHeight_,
+                         bool WXUNUSED(unicodeMode_),
+                         int WXUNUSED(technology_)) {
+    wid = new wxSTCListBoxWin(GETWIN(parent.GetID()), &m_listBox, m_visualData,
+                              lineHeight_);
+}
+
+
+void ListBoxImpl::SetAverageCharWidth(int width) {
+    m_listBox->SetAverageCharWidth(width);
+}
+
+
+void ListBoxImpl::SetVisibleRows(int rows) {
+    m_visualData->SetDesiredVisibleRows(rows);
+}
+
+
+int ListBoxImpl::GetVisibleRows() const {
+    return m_visualData->GetDesiredVisibleRows();
+}
+
+PRectangle ListBoxImpl::GetDesiredRect() {
+    return m_listBox->GetDesiredRect();
+}
+
+
+int ListBoxImpl::CaretFromEdge() {
+    return m_listBox->CaretFromEdge();
+}
+
+
+void ListBoxImpl::Clear() {
+    m_listBox->Clear();
+}
+
+
+void ListBoxImpl::Append(char *s, int type) {
+    m_listBox->Append(s, type);
+}
+
+
+void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
+    m_listBox->SetList(list, separator, typesep);
 }
 
 
 int ListBoxImpl::Length() {
-    return GETLB(wid)->GetItemCount();
+    return m_listBox->Length();
 }
 
 
 void ListBoxImpl::Select(int n) {
-    bool select = true;
-    if (n == -1) {
-        n = 0;
-        select = false;
-    }
-    GETLB(wid)->EnsureVisible(n);
-    GETLB(wid)->Select(n, select);
+    m_listBox->Select(n);
 }
 
 
 int ListBoxImpl::GetSelection() {
-    return GETLB(wid)->GetFirstSelected();
+    return m_listBox->GetSelection();
 }
 
 
@@ -2512,62 +3133,46 @@ int ListBoxImpl::Find(const char *WXUNUSED(prefix)) {
 
 
 void ListBoxImpl::GetValue(int n, char *value, int len) {
-    wxListItem item;
-    item.SetId(n);
-    item.SetColumn(1);
-    item.SetMask(wxLIST_MASK_TEXT);
-    GETLB(wid)->GetItem(item);
-    strncpy(value, wx2stc(item.GetText()), len);
-    value[len-1] = '\0';
+    m_listBox->GetValue(n, value, len);
 }
 
-void ListBoxImpl::RegisterImageHelper(int type, wxBitmap& bmp)
+void ListBoxImpl::RegisterImageHelper(int type, const wxBitmap& bmp)
 {
-    if (! imgList) {
-        // assumes all images are the same size
-        imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), true);
-        imgTypeMap = new wxArrayInt;
-    }
-
-    int idx = imgList->Add(bmp);
-
-    // do we need to extend the mapping array?
-    wxArrayInt& itm = *imgTypeMap;
-    if ( itm.GetCount() < (size_t)type+1)
-        itm.Add(-1, type - itm.GetCount() + 1);
-
-    // Add an item that maps type to the image index
-    itm[type] = idx;
+    m_visualData->RegisterImage(type, bmp);
 }
 
+
 void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
-    wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
-    wxImage img(stream, wxBITMAP_TYPE_XPM);
-    wxBitmap bmp(img);
-    RegisterImageHelper(type, bmp);
+    m_visualData->RegisterImage(type, xpm_data);
 }
 
 
 void ListBoxImpl::RegisterRGBAImage(int type, int width, int height,
                                     const unsigned char *pixelsImage)
 {
-#ifdef wxHAS_RAW_BITMAP
-    wxBitmap bmp = BitmapFromRGBAImage(width, height, pixelsImage);
-    RegisterImageHelper(type, bmp);
-#endif
+    m_visualData->RegisterRGBAImage(type, width, height, pixelsImage);
 }
 
 
 void ListBoxImpl::ClearRegisteredImages() {
-    wxDELETE(imgList);
-    wxDELETE(imgTypeMap);
-    if (wid)
-        GETLB(wid)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
+    m_visualData->ClearRegisteredImages();
 }
 
 
 void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) {
-    GETLBW(wid)->SetDoubleClickAction(action, data);
+    m_listBox->SetDoubleClickAction(action, data);
+}
+
+void ListBoxImpl::SetColours(const wxColour& background, const wxColour& text,
+                             const wxColour& hiliBg, const wxColour& hiliText)
+{
+    m_visualData->SetColours(background, text, hiliBg, hiliText);
+}
+
+void ListBoxImpl::UseListCtrlStyle(bool useListCtrl, const wxColour& currentBg,
+                                   const wxColour& currentText)
+{
+    m_visualData->UseListCtrlStyle(useListCtrl, currentBg, currentText);
 }
 
 
diff --git a/src/stc/PlatWX.h b/src/stc/PlatWX.h
index 3b051198c6..8449c870d2 100644
--- a/src/stc/PlatWX.h
+++ b/src/stc/PlatWX.h
@@ -1,4 +1,16 @@
+#ifndef _SRC_STC_PLATWX_H_
+#define _SRC_STC_PLATWX_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_STC
+
+#include "wx/imaglist.h"
+#include "Platform.h"
+
+class wxStyledTextCtrl;
+class wxSTCListBox;
+class wxSTCListBoxVisualData;
 
 
 
@@ -6,6 +18,144 @@ wxRect wxRectFromPRectangle(PRectangle prc);
 PRectangle PRectangleFromwxRect(wxRect rc);
 wxColour wxColourFromCD(const ColourDesired& ca);
 
+class ListBoxImpl : public ListBox {
+private:
+    wxSTCListBox*           m_listBox;
+    wxSTCListBoxVisualData* m_visualData;
+
+public:
+    ListBoxImpl();
+    ~ListBoxImpl();
+    static ListBox *Allocate();
+
+    virtual void SetFont(Font &font) wxOVERRIDE;
+    virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_) wxOVERRIDE;
+    virtual void SetAverageCharWidth(int width) wxOVERRIDE;
+    virtual void SetVisibleRows(int rows) wxOVERRIDE;
+    virtual int GetVisibleRows() const wxOVERRIDE;
+    virtual PRectangle GetDesiredRect() wxOVERRIDE;
+    virtual int CaretFromEdge() wxOVERRIDE;
+    virtual void Clear() wxOVERRIDE;
+    virtual void Append(char *s, int type = -1) wxOVERRIDE;
+            void Append(const wxString& text, int type);
+    virtual int Length() wxOVERRIDE;
+    virtual void Select(int n) wxOVERRIDE;
+    virtual int GetSelection() wxOVERRIDE;
+    virtual int Find(const char *prefix) wxOVERRIDE;
+    virtual void GetValue(int n, char *value, int len) wxOVERRIDE;
+    virtual void RegisterImage(int type, const char *xpm_data) wxOVERRIDE;
+            void RegisterImageHelper(int type, const wxBitmap& bmp);
+    virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) wxOVERRIDE;
+    virtual void ClearRegisteredImages() wxOVERRIDE;
+    virtual void SetDoubleClickAction(CallBackAction, void *) wxOVERRIDE;
+    virtual void SetList(const char* list, char separator, char typesep) wxOVERRIDE;
+            void SetColours(const wxColour&, const wxColour&,
+                            const wxColour&, const wxColour&);
+            void UseListCtrlStyle(bool, const wxColour&, const wxColour&);
+};
+
+
+//----------------------------------------------------------------------
+// wxSTCPopupWindow
+
+#if defined(__WXOSX_COCOA__) || defined(__WXMSW__) || defined(__WXGTK__)
+    #define wxSTC_POPUP_IS_CUSTOM 1
+#else
+    #define wxSTC_POPUP_IS_CUSTOM 0
+#endif
+
+// Define the base class used for wxSTCPopupWindow.
+#ifdef __WXOSX_COCOA__
+
+    #include "wx/nonownedwnd.h"
+    #define wxSTC_POPUP_IS_FRAME 0
+
+    class wxSTCPopupBase:public wxNonOwnedWindow
+    {
+    public:
+        wxSTCPopupBase(wxWindow*);
+        virtual ~wxSTCPopupBase();
+        virtual bool Show(bool show=true) wxOVERRIDE;
+
+    protected:
+        virtual void DoSetSize(int, int, int, int, int) wxOVERRIDE;
+        void SetSTCCursor(int);
+        void OnMouseEnter(wxMouseEvent&);
+        void OnMouseLeave(wxMouseEvent&);
+
+    private:
+        WX_NSWindow       m_nativeWin;
+        wxStyledTextCtrl* m_stc;
+    };
+
+#elif wxUSE_POPUPWIN
+
+    #include "wx/popupwin.h"
+    #define wxSTC_POPUP_IS_FRAME 0
+
+    class wxSTCPopupBase:public wxPopupWindow
+    {
+    public:
+        wxSTCPopupBase(wxWindow*);
+        #ifdef __WXGTK__
+            virtual ~wxSTCPopupBase();
+        #elif defined(__WXMSW__)
+            virtual bool Show(bool show=true) wxOVERRIDE;
+            virtual bool MSWHandleMessage(WXLRESULT *result, WXUINT message,
+                                          WXWPARAM wParam, WXLPARAM lParam)
+                                          wxOVERRIDE;
+        #endif
+    };
+
+#else
+
+    #include "wx/frame.h"
+    #define wxSTC_POPUP_IS_FRAME 1
+
+    class wxSTCPopupBase:public wxFrame
+    {
+    public:
+        wxSTCPopupBase(wxWindow*);
+        #ifdef __WXMSW__
+            virtual bool Show(bool show=true) wxOVERRIDE;
+            virtual bool MSWHandleMessage(WXLRESULT *result, WXUINT message,
+                                          WXWPARAM wParam, WXLPARAM lParam)
+                                          wxOVERRIDE;
+        #elif !wxSTC_POPUP_IS_CUSTOM
+            virtual bool Show(bool show=true) wxOVERRIDE;
+            void ActivateParent();
+        #endif
+    };
+
+#endif // __WXOSX_COCOA__
+
+class wxSTCPopupWindow:public wxSTCPopupBase
+{
+public:
+    wxSTCPopupWindow(wxWindow*);
+    virtual ~wxSTCPopupWindow();
+    virtual bool Destroy() wxOVERRIDE;
+    virtual bool AcceptsFocus() const wxOVERRIDE;
+
+protected:
+    virtual void DoSetSize(int x, int y, int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
+    void OnParentMove(wxMoveEvent& event);
+    #if defined(__WXOSX_COCOA__) || (defined(__WXGTK__)&&!wxSTC_POPUP_IS_FRAME)
+        void OnIconize(wxIconizeEvent& event);
+    #elif !wxSTC_POPUP_IS_CUSTOM
+        void OnFocus(wxFocusEvent& event);
+    #endif
+
+private:
+    wxPoint   m_initialPosition;
+    wxWindow* m_tlw;
+};
+
+
+//----------------------------------------------------------------------
+// SurfaceData
+
 class SurfaceData
 {
 public:
@@ -72,3 +222,7 @@ private:
 };
 
 #endif // wxUSE_GRAPHICS_DIRECT2D
+
+#endif // wxUSE_STC
+
+#endif // _SRC_STC_PLATWX_H_
diff --git a/src/stc/PlatWXcocoa.h b/src/stc/PlatWXcocoa.h
new file mode 100644
index 0000000000..74c7f4856c
--- /dev/null
+++ b/src/stc/PlatWXcocoa.h
@@ -0,0 +1,28 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/stc/PlatWXcocoa.h
+// Purpose:     Declaration of utility functions for wxSTC with cocoa
+// Author:      New Pagodi
+// Created:     2019-03-10
+// Copyright:   (c) 2019 wxWidgets development team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _SRC_STC_PLATWXCOCOA_H_
+#define _SRC_STC_PLATWXCOCOA_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_STC
+
+// Functions used to create and manage popup windows.
+WX_NSWindow CreateFloatingWindow(wxWindow*);
+void CloseFloatingWindow(WX_NSWindow win);
+void ShowFloatingWindow(WX_NSWindow win);
+void HideFloatingWindow(WX_NSWindow win);
+
+// Function needed for list control colours.
+wxColour GetListHighlightColour();
+
+#endif // wxUSE_STC
+
+#endif // _SRC_STC_PLATWXCOCOA_H_
diff --git a/src/stc/PlatWXcocoa.mm b/src/stc/PlatWXcocoa.mm
new file mode 100644
index 0000000000..1c5498b2be
--- /dev/null
+++ b/src/stc/PlatWXcocoa.mm
@@ -0,0 +1,133 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/stc/PlatWXcocoa.mm
+// Purpose:     Implementation of utility functions for wxSTC with cocoa
+// Author:      New Pagodi
+// Created:     2019-03-10
+// Copyright:   (c) 2019 wxWidgets development team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#if wxUSE_STC
+
+#include "wx/osx/private.h"
+#include "PlatWXcocoa.h"
+
+// A simple view used for popup windows.
+
+@interface wxSTCPopupBaseView : NSView
+{
+@private
+    NSTrackingArea * m_trackingArea;
+    wxWindow*        m_wxWin;
+}
+
+- (id)initWithwxWin:(wxWindow*) wxWin;
+
+@end
+
+@implementation wxSTCPopupBaseView
+
+- (id)initWithwxWin:(wxWindow*) wxWin
+{
+    m_trackingArea = nil;
+
+    self = [super init];
+    if ( self )
+        m_wxWin = wxWin;
+
+    return self;
+}
+
+- (void)updateTrackingAreas
+{
+    if( m_trackingArea != nil )
+    {
+        [self removeTrackingArea:m_trackingArea];
+        [m_trackingArea release];
+    }
+
+    int options = NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways;
+    m_trackingArea = [[NSTrackingArea alloc] initWithRect: [self bounds]
+                                                  options: options
+                                                    owner: self
+                                                 userInfo: nil];
+    [self addTrackingArea:m_trackingArea];
+}
+
+- (void)mouseEntered:(NSEvent *)evt
+{
+    wxMouseEvent wxevent(wxEVT_ENTER_WINDOW);
+    wxevent.SetEventObject(m_wxWin);
+    m_wxWin->ProcessWindowEvent(wxevent);
+}
+
+- (void)mouseExited:(NSEvent *)evt
+{
+    wxMouseEvent wxevent(wxEVT_LEAVE_WINDOW);
+    wxevent.SetEventObject(m_wxWin);
+    m_wxWin->ProcessWindowEvent(wxevent);
+}
+
+- (void)mouseDown:(NSEvent *)evt
+{
+    NSRect locationInWindow = NSZeroRect;
+    locationInWindow.origin = [evt locationInWindow];
+    NSPoint locationInView = [self convertPoint: locationInWindow.origin
+                                       fromView: nil];
+    wxPoint locationInViewWX = wxFromNSPoint(self, locationInView);
+
+    wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
+    wxevent.SetEventObject(m_wxWin);
+    wxevent.SetX(locationInViewWX.x);
+    wxevent.SetY(locationInViewWX.y);
+    m_wxWin->ProcessWindowEvent(wxevent);
+}
+
+- (void)drawRect:(NSRect)dirtyRect
+{
+    static_cast<wxWidgetCocoaImpl*>(m_wxWin->GetPeer())->
+        drawRect(&dirtyRect, self, NULL);
+}
+
+@end
+
+
+// Utility functions.
+
+WX_NSWindow CreateFloatingWindow(wxWindow* wxWin)
+{
+    NSWindow* w = [[NSWindow alloc] initWithContentRect: NSZeroRect
+                                              styleMask: NSBorderlessWindowMask
+                                                backing: NSBackingStoreBuffered
+                                                  defer: NO];
+    [w setLevel:NSFloatingWindowLevel];
+    [w setHasShadow:YES];
+    [w setContentView:[[wxSTCPopupBaseView alloc] initWithwxWin:wxWin]];
+
+    return w;
+}
+
+void CloseFloatingWindow(WX_NSWindow nsWin)
+{
+    [nsWin setReleasedWhenClosed:YES];
+    [nsWin close];
+}
+
+void ShowFloatingWindow(WX_NSWindow nsWin)
+{
+    [nsWin orderFront:NSApp];
+}
+
+void HideFloatingWindow(WX_NSWindow nsWin)
+{
+    [nsWin orderOut:NSApp];
+}
+
+wxColour GetListHighlightColour()
+{
+    return wxColour([NSColor alternateSelectedControlColor]);
+}
+
+#endif // wxUSE_STC
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index e9ddba686d..9dcd59814c 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -33,6 +33,9 @@
 #include "wx/dataobj.h"
 #include "wx/clipbrd.h"
 #include "wx/dnd.h"
+#include "wx/image.h"
+#include "wx/scopedarray.h"
+#include "wx/dcbuffer.h"
 
 #if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING
     #include "wx/beforestd.h"
@@ -50,6 +53,9 @@
     // GetHwndOf()
     #include "wx/msw/private.h"
 #endif
+#ifdef __WXGTK20__
+    #include <gdk/gdk.h>
+#endif
 
 //----------------------------------------------------------------------
 // Helper classes
@@ -90,62 +96,42 @@ void  wxSTCDropTarget::OnLeave() {
 #endif // wxUSE_DRAG_AND_DROP
 
 
-#if wxUSE_POPUPWIN
-#include "wx/popupwin.h"
-#define wxSTCCallTipBase wxPopupWindow
-#else
-#include "wx/frame.h"
-#define wxSTCCallTipBase wxFrame
-#endif
-
-#include "wx/dcbuffer.h"
-
-class wxSTCCallTip : public wxSTCCallTipBase {
+class wxSTCCallTip : public wxSTCPopupWindow {
 public:
     wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
-#if wxUSE_POPUPWIN
-        wxSTCCallTipBase(parent, wxBORDER_NONE),
-#else
-        wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
-                         wxFRAME_NO_TASKBAR
-                         | wxFRAME_FLOAT_ON_PARENT
-                         | wxBORDER_NONE
-#ifdef __WXMAC__
-                         | wxPOPUP_WINDOW
-#endif
-            ),
-#endif
-          m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
-        {
-            SetBackgroundStyle(wxBG_STYLE_PAINT);
-            SetName("wxSTCCallTip");
-        }
+        wxSTCPopupWindow(parent), m_ct(ct), m_swx(swx)
+    {
+        Bind(wxEVT_LEFT_DOWN, &wxSTCCallTip::OnLeftDown, this);
+        Bind(wxEVT_SIZE, &wxSTCCallTip::OnSize, this);
+        Bind(wxEVT_PAINT, &wxSTCCallTip::OnPaint, this);
 
-    ~wxSTCCallTip() {
-#if wxUSE_POPUPWIN && defined(__WXGTK__)
-        wxRect rect = GetRect();
-        rect.x = m_cx;
-        rect.y = m_cy;
-        GetParent()->Refresh(false, &rect);
+#ifdef __WXMSW__
+        Bind(wxEVT_ERASE_BACKGROUND, &wxSTCCallTip::OnEraseBackground, this);
+        SetBackgroundStyle(wxBG_STYLE_ERASE);
+#else
+        SetBackgroundStyle(wxBG_STYLE_PAINT);
 #endif
+
+        SetName("wxSTCCallTip");
     }
 
-    bool AcceptsFocus() const wxOVERRIDE { return false; }
-
-    void OnPaint(wxPaintEvent& WXUNUSED(evt))
+    void DrawBack(const wxSize& size)
     {
-        wxAutoBufferedPaintDC dc(this);
+        m_back = wxBitmap(size);
+        wxMemoryDC mem(m_back);
         Surface* surfaceWindow = Surface::Allocate(m_swx->technology);
-        surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
+        surfaceWindow->Init(&mem, m_ct->wDraw.GetID());
         m_ct->PaintCT(surfaceWindow);
         surfaceWindow->Release();
         delete surfaceWindow;
     }
 
-    void OnFocus(wxFocusEvent& event)
+    virtual void Refresh(bool eraseBg=true, const wxRect *rect=NULL) wxOVERRIDE
     {
-        GetParent()->SetFocus();
-        event.Skip();
+        if ( rect == NULL )
+            DrawBack(GetSize());
+
+        wxSTCPopupWindow::Refresh(eraseBg, rect);
     }
 
     void OnLeftDown(wxMouseEvent& event)
@@ -156,58 +142,45 @@ public:
         m_swx->CallTipClick();
     }
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO) wxOVERRIDE
+    void OnSize(wxSizeEvent& event)
     {
-        // convert coords to screen coords since we're a top-level window
-        if (x != wxDefaultCoord) {
-            m_cx = x;
-            GetParent()->ClientToScreen(&x, NULL);
-        }
-        if (y != wxDefaultCoord) {
-            m_cy = y;
-            GetParent()->ClientToScreen(NULL, &y);
-        }
-        wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
+        DrawBack(event.GetSize());
+        event.Skip();
+    }
+
+#ifdef __WXMSW__
+
+    void OnPaint(wxPaintEvent& WXUNUSED(evt))
+    {
+        wxRect upd = GetUpdateClientRect();
+        wxMemoryDC mem(m_back);
+        wxPaintDC dc(this);
+
+        dc.Blit(upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight(), &mem,
+                upd.GetX(), upd.GetY());
+    }
+
+    void OnEraseBackground(wxEraseEvent& event)
+    {
+        event.GetDC()->DrawBitmap(m_back, 0, 0);
     }
 
-#if wxUSE_POPUPWIN
 #else
-    virtual bool Show( bool show = true )
-    {
-        // Although we're a frame, we always want the parent to be active, so
-        // raise it whenever we get shown.
-        bool rv = wxSTCCallTipBase::Show(show);
-        if (rv && show)
-        {
-            wxTopLevelWindow *frame = wxDynamicCast(
-                wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-            if (frame)
-                frame->Raise();
-        }
-        return rv;
-    }
-#endif
 
-    wxPoint GetMyPosition()
+    void OnPaint(wxPaintEvent& WXUNUSED(evt))
     {
-        return wxPoint(m_cx, m_cy);
+        wxAutoBufferedPaintDC dc(this);
+        dc.DrawBitmap(m_back, 0, 0);
     }
 
+#endif // __WXMSW__
+
 private:
     CallTip*      m_ct;
     ScintillaWX*  m_swx;
-    int           m_cx, m_cy;
-    wxDECLARE_EVENT_TABLE();
+    wxBitmap      m_back;
 };
 
-wxBEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
-    EVT_PAINT(wxSTCCallTip::OnPaint)
-    EVT_SET_FOCUS(wxSTCCallTip::OnFocus)
-    EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown)
-wxEND_EVENT_TABLE()
-
 
 //----------------------------------------------------------------------
 
@@ -422,7 +395,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
 
     int vertEnd = nMax+1;
     if (!verticalScrollBarVisible)
-        vertEnd = 0;
+        nPage = vertEnd + 1;
 
     // Check the vertical scrollbar
     if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
@@ -450,15 +423,15 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     int horizEnd = scrollWidth;
     if (horizEnd < 0)
         horizEnd = 0;
+    int pageWidth = static_cast<int>(rcText.Width());
     if (!horizontalScrollBarVisible || Wrapping())
-        horizEnd = 0;
-    int pageWidth = wxRound(rcText.Width());
+        pageWidth = horizEnd + 1;
 
     if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
         int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
         int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
         int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
-        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
+        if ((sbMax != horizEnd) || (sbThumb != pageWidth)) {
             stc->SetScrollbar(wxHORIZONTAL, sbPos, pageWidth, horizEnd);
             modified = true;
             if (scrollWidth < pageWidth) {
@@ -470,7 +443,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int sbMax    = stc->m_hScrollBar->GetRange();
         int sbThumb  = stc->m_hScrollBar->GetPageSize();
         int sbPos    = stc->m_hScrollBar->GetThumbPosition();
-        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
+        if ((sbMax != horizEnd) || (sbThumb != pageWidth)) {
             stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth);
             modified = true;
             if (scrollWidth < pageWidth) {
@@ -1124,13 +1097,6 @@ void ScintillaWX::DoAddChar(int key) {
 int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
 {
     int key = evt.GetKeyCode();
-    if (key == WXK_NONE) {
-        // This is a Unicode character not representable in Latin-1 or some key
-        // without key code at all (e.g. dead key or VK_PROCESSKEY under MSW).
-        if ( consumed )
-            *consumed = false;
-        return 0;
-    }
 
     if (evt.RawControlDown() && key >= 1 && key <= 26 && key != WXK_BACK)
         key += 'A' - 1;
@@ -1171,6 +1137,52 @@ int  ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
     case WXK_ALT:               key = 0; break;
     case WXK_SHIFT:             key = 0; break;
     case WXK_MENU:              key = SCK_MENU; break;
+    case WXK_NONE:
+#ifdef __WXGTK20__
+        if (evt.RawControlDown())
+        {
+            // To allow Ctrl-key shortcuts to work with non-Latin keyboard layouts,
+            // look for any available layout that would produce an ASCII letter for
+            // the given hardware keycode
+            const unsigned keycode = evt.GetRawKeyFlags();
+            GdkKeymap* keymap = gdk_keymap_get_for_display(gdk_display_get_default());
+            GdkKeymapKey keymapKey = { keycode, 0, 1 };
+            do {
+                const unsigned keyval = gdk_keymap_lookup_key(keymap, &keymapKey);
+                if (keyval >= 'A' && keyval <= 'Z')
+                {
+                    key = keyval;
+                    break;
+                }
+                keymapKey.group++;
+            } while (keymapKey.group < 4);
+            if (key == WXK_NONE)
+            {
+                // There may be no keyboard layouts with Latin keys available,
+                // fall back to a hard-coded mapping for the common pc105
+                static const char keycodeToKeyval[] = {
+                      0,   0,   0,   0,   0,   0,   0,   0,
+                      0,   0,   0,   0,   0,   0,   0,   0,
+                      0,   0,   0,   0,   0,   0,   0,   0,
+                    'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I',
+                    'O', 'P',   0,   0,   0,   0, 'A', 'S',
+                    'D', 'F', 'G', 'H', 'J', 'K', 'L',   0,
+                      0,   0,   0,   0, 'Z', 'X', 'C', 'V',
+                    'B', 'N', 'M'
+                };
+                if (keycode < sizeof(keycodeToKeyval))
+                    key = keycodeToKeyval[keycode];
+            }
+        }
+        if (key == WXK_NONE)
+#endif
+        {
+            // This is a Unicode character not representable in Latin-1 or some key
+            // without key code at all (e.g. dead key or VK_PROCESSKEY under MSW).
+            if (consumed)
+                *consumed = false;
+            return 0;
+        }
     }
 
     int rv = KeyDownWithModifiers
@@ -1336,6 +1348,75 @@ bool ScintillaWX::GetUseAntiAliasing() {
     return vs.extraFontFlag != 0;
 }
 
+void ScintillaWX::DoMarkerDefineBitmap(int markerNumber, const wxBitmap& bmp) {
+    if ( 0 <= markerNumber && markerNumber <= MARKER_MAX) {
+        // Build an RGBA buffer from bmp.
+        const int totalPixels = bmp.GetWidth() * bmp.GetHeight();
+        wxScopedArray<unsigned char> rgba(4*bmp.GetWidth()*bmp.GetHeight());
+        wxImage img = bmp.ConvertToImage();
+        int curRGBALoc = 0, curDataLoc = 0, curAlphaLoc = 0;
+
+        if ( img.HasMask() ) {
+            for ( int y = 0; y < bmp.GetHeight(); ++y ) {
+                for ( int x = 0 ; x < bmp.GetWidth(); ++x ) {
+                    rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                    rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                    rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                    rgba[curRGBALoc++] = img.IsTransparent(x,y)
+                        ? wxALPHA_TRANSPARENT : wxALPHA_OPAQUE ;
+                }
+            }
+        }
+        else if ( img.HasAlpha() ) {
+            for ( int i = 0; i < totalPixels; ++i ) {
+                rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                rgba[curRGBALoc++] = img.GetAlpha()[curAlphaLoc++];
+            }
+        }
+        else {
+            for ( int i = 0; i < totalPixels; ++i ) {
+                rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                rgba[curRGBALoc++] = img.GetData()[curDataLoc++];
+                rgba[curRGBALoc++] = wxALPHA_OPAQUE ;
+            }
+        }
+
+        // Now follow the same procedure used for handling the
+        // SCI_MARKERDEFINERGBAIMAGE message, except use the bitmap's width and
+        // height instead of the values stored in sizeRGBAImage.
+        Point bitmapSize = Point::FromInts(bmp.GetWidth(), bmp.GetHeight());
+        vs.markers[markerNumber].SetRGBAImage(bitmapSize, 1.0f, rgba.get());
+        vs.CalcLargestMarkerHeight();
+    }
+    InvalidateStyleData();
+    RedrawSelMargin();
+}
+
+void ScintillaWX::DoRegisterImage(int type, const wxBitmap& bmp) {
+    static_cast<ListBoxImpl*>(ac.lb)->RegisterImageHelper(type, bmp);
+}
+
+void ScintillaWX::SetListBoxColours(const wxColour& background,
+                                          const wxColour& text,
+                                          const wxColour& highlight,
+                                          const wxColour& highlightText)
+{
+    static_cast<ListBoxImpl*>(ac.lb)->SetColours(background, text,
+                                                  highlight, highlightText);
+}
+
+void ScintillaWX::UseListCtrlStyleForLists(bool useListCtrl,
+                                           const wxColour& currentBgColour,
+                                           const wxColour& currentTextColour)
+{
+    static_cast<ListBoxImpl*>(ac.lb)->UseListCtrlStyle(useListCtrl,
+                                                       currentBgColour,
+                                                       currentTextColour);
+}
+
 sptr_t ScintillaWX::DirectFunction(
     ScintillaWX* swx, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
     return swx->WndProc(iMessage, wParam, lParam);
diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index d4d03f9c0e..5bbe6179c3 100644
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -199,6 +199,11 @@ public:
     bool GetUseAntiAliasing();
     SurfaceData* GetSurfaceData() const {return m_surfaceData;}
     void SetPaintAbandoned(){paintState = paintAbandoned;}
+    void DoMarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+    void DoRegisterImage(int type, const wxBitmap& bmp);
+    void SetListBoxColours(const wxColour&, const wxColour&,
+                           const wxColour&, const wxColour&);
+    void UseListCtrlStyleForLists(bool, const wxColour&, const wxColour&);
 
 private:
     bool                capturedMouse;
diff --git a/src/stc/gen_docs.py b/src/stc/gen_docs.py
index c66ff27f77..7228e78cda 100644
--- a/src/stc/gen_docs.py
+++ b/src/stc/gen_docs.py
@@ -40,9 +40,11 @@ categoriesList = [
     ('OtherSettings'                   ,'Other settings', 0),
     ('BraceHighlighting'               ,'Brace highlighting', 0),
     ('TabsAndIndentationGuides'        ,'Tabs and Indentation Guides', 0),
-    ('Markers'                         ,'Markers', 0),
+    ('Markers'                         ,'Markers',
+        ('@see MarkerDefineBitmap',)),
     ('Indicators'                      ,'Indicators', 0),
-    ('Autocompletion'                  ,'Autocompletion', 0),
+    ('Autocompletion'                  ,'Autocompletion',
+        ('@see RegisterImage(int, const wxBitmap&)',)),
     ('UserLists'                       ,'User lists', 0),
     ('CallTips'                        ,'Call tips', 0),
     ('KeyboardCommands'                ,'Keyboard commands', 0),
@@ -844,7 +846,13 @@ docSubstitutions = {
         'SC_SEL_RECTANGLE':'wxSTC_SEL_RECTANGLE','SC_SEL_THIN':'wxSTC_SEL_THIN',
         'SC_SEL_LINES':'wxSTC_SEL_LINES'},
 
-    'SetFontQuality':{' from the FontQuality enumeration':''}
+    'SetFontQuality':{' from the FontQuality enumeration':''},
+
+    'GetWrapVisualFlags':{'Retrive':'Retrieve'},
+
+    'GetWrapVisualFlagsLocation':{'Retrive':'Retrieve'},
+
+    'GetWrapStartIndent':{'Retrive':'Retrieve'}
 }
 
 
@@ -1400,7 +1408,10 @@ sinceAnnotations= {
     'SetMouseWheelCaptures':'3.1.1',
     'SetTabDrawMode':'3.1.1',
     'TargetWholeDocument':'3.1.1',
-    'ToggleFoldShowText':'3.1.1'
+    'ToggleFoldShowText':'3.1.1',
+
+    'MarkerDefinePixmap':'3.1.3',
+    'RegisterImage':'3.1.3'
 }
 
 
diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 2de2832169..e885cda3bb 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -213,22 +213,11 @@ methodOverrideMap = {
     ),
 
 
-    'MarkerDefinePixmap' :
-    ('MarkerDefineBitmap',
-     '''void %s(int markerNumber, const wxBitmap& bmp);''',
-     '''void %s(int markerNumber, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(%s, markerNumber, (sptr_t)buff);
-        delete [] buff;'''
+   'MarkerDefinePixmap' :
+    (0,
+     '''void %s(int markerNumber, const char* const* xpmData);''',
+     '''void %s(int markerNumber, const char* const* xpmData) {
+        SendMsg(%s, markerNumber, (sptr_t)xpmData);'''
     ),
 
     'GetMargins' : ('GetMarginCount', 0, 0),
@@ -538,20 +527,9 @@ methodOverrideMap = {
 
     'RegisterImage' :
     (0,
-     '''void %s(int type, const wxBitmap& bmp);''',
-     '''void %s(int type, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(%s, type, (sptr_t)buff);
-        delete [] buff;'''
+     '''void %s(int type, const char* const* xpmData);''',
+     '''void %s(int type, const char* const* xpmData) {
+        SendMsg(%s, type, (sptr_t)xpmData);'''
     ),
 
     'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0),
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 61eea8dad3..54695d5466 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -662,19 +662,8 @@ int wxStyledTextCtrl::MarkerPrevious(int lineStart, int markerMask)
 }
 
 // Define a marker from a bitmap
-void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(SCI_MARKERDEFINEPIXMAP, markerNumber, (sptr_t)buff);
-        delete [] buff;
+void wxStyledTextCtrl::MarkerDefinePixmap(int markerNumber, const char* const* xpmData) {
+        SendMsg(SCI_MARKERDEFINEPIXMAP, markerNumber, (sptr_t)xpmData);
 }
 
 // Add a set of markers to a line.
@@ -1464,19 +1453,8 @@ bool wxStyledTextCtrl::AutoCompGetDropRestOfWord() const
 }
 
 // Register an image for use in autocompletion lists.
-void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        if (img.HasAlpha())
-            img.ConvertAlphaToMask();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(SCI_REGISTERIMAGE, type, (sptr_t)buff);
-        delete [] buff;
+void wxStyledTextCtrl::RegisterImage(int type, const char* const* xpmData) {
+        SendMsg(SCI_REGISTERIMAGE, type, (sptr_t)xpmData);
 }
 
 // Clear all the registered images.
@@ -2384,7 +2362,7 @@ void wxStyledTextCtrl::SetWrapVisualFlags(int wrapVisualFlags)
     SendMsg(SCI_SETWRAPVISUALFLAGS, wrapVisualFlags, 0);
 }
 
-// Retrive the display mode of visual flags for wrapped lines.
+// Retrieve the display mode of visual flags for wrapped lines.
 int wxStyledTextCtrl::GetWrapVisualFlags() const
 {
     return SendMsg(SCI_GETWRAPVISUALFLAGS, 0, 0);
@@ -2396,7 +2374,7 @@ void wxStyledTextCtrl::SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation)
     SendMsg(SCI_SETWRAPVISUALFLAGSLOCATION, wrapVisualFlagsLocation, 0);
 }
 
-// Retrive the location of visual flags for wrapped lines.
+// Retrieve the location of visual flags for wrapped lines.
 int wxStyledTextCtrl::GetWrapVisualFlagsLocation() const
 {
     return SendMsg(SCI_GETWRAPVISUALFLAGSLOCATION, 0, 0);
@@ -2408,7 +2386,7 @@ void wxStyledTextCtrl::SetWrapStartIndent(int indent)
     SendMsg(SCI_SETWRAPSTARTINDENT, indent, 0);
 }
 
-// Retrive the start indent for wrapped lines.
+// Retrieve the start indent for wrapped lines.
 int wxStyledTextCtrl::GetWrapStartIndent() const
 {
     return SendMsg(SCI_GETWRAPSTARTINDENT, 0, 0);
@@ -5058,6 +5036,32 @@ void wxStyledTextCtrl::AnnotationClearLine(int line) {
     SendMsg(SCI_ANNOTATIONSETTEXT, line, (sptr_t)NULL);
 }
 
+void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber,
+                                          const wxBitmap& bmp) {
+    m_swx->DoMarkerDefineBitmap(markerNumber, bmp);
+}
+
+void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp)
+{
+    m_swx->DoRegisterImage(type, bmp);
+}
+
+void wxStyledTextCtrl::AutoCompSetColours(const wxColour& background,
+                                          const wxColour& text,
+                                          const wxColour& highlight,
+                                          const wxColour& highlightText)
+{
+    m_swx->SetListBoxColours(background, text, highlight, highlightText);
+}
+
+void wxStyledTextCtrl::AutoCompUseListCtrl(bool useListCtrl,
+                                           const wxColour& currentBgColour,
+                                           const wxColour& currentTextColour)
+{
+    m_swx->UseListCtrlStyleForLists(useListCtrl, currentBgColour,
+                                    currentTextColour);
+}
+
 
 
 
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 827633364d..91807cf3f9 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -563,6 +563,32 @@ void wxStyledTextCtrl::AnnotationClearLine(int line) {
     SendMsg(SCI_ANNOTATIONSETTEXT, line, (sptr_t)NULL);
 }
 
+void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber,
+                                          const wxBitmap& bmp) {
+    m_swx->DoMarkerDefineBitmap(markerNumber, bmp);
+}
+
+void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp)
+{
+    m_swx->DoRegisterImage(type, bmp);
+}
+
+void wxStyledTextCtrl::AutoCompSetColours(const wxColour& background,
+                                          const wxColour& text,
+                                          const wxColour& highlight,
+                                          const wxColour& highlightText)
+{
+    m_swx->SetListBoxColours(background, text, highlight, highlightText);
+}
+
+void wxStyledTextCtrl::AutoCompUseListCtrl(bool useListCtrl,
+                                           const wxColour& currentBgColour,
+                                           const wxColour& currentTextColour)
+{
+    m_swx->UseListCtrlStyleForLists(useListCtrl, currentBgColour,
+                                    currentTextColour);
+}
+
 
 
 
diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 8413084a7c..ea04d4f60c 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -298,6 +298,22 @@ public:
     // Clear annotations from the given line.
     void AnnotationClearLine(int line);
 
+    // Define a marker from a bitmap.
+    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+
+    // Register an image for use in autocompletion lists.
+    void RegisterImage(int type, const wxBitmap& bmp);
+
+    // Set the colours used to display the items in an autocompletion list.
+    void AutoCompSetColours(const wxColour& background, const wxColour& text,
+                            const wxColour& highlight,
+                            const wxColour& highlightText);
+
+    // Use a wxListCtrl to display autocompletion lists.
+    void AutoCompUseListCtrl(bool useListCtrl = true,
+                             const wxColour& currentBgColour = wxNullColour,
+                             const wxColour& currentTextColour = wxNullColour);
+
 
 
     // The following methods are nearly equivalent to their similarly named
diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in
index 8e18eb8677..a3c0334908 100644
--- a/src/stc/stc.interface.h.in
+++ b/src/stc/stc.interface.h.in
@@ -7,7 +7,7 @@
 
 /*
     IMPORTANT: This file is generated by src/stc/gen_iface.py from
-               src/stc/stc.interface.h.in.  Do not edit the file in 
+               src/stc/stc.interface.h.in.  Do not edit the file in
                interface/wx/stc or your changes will be lost.
 */
 
@@ -223,7 +223,7 @@ public:
     /**
        Extract style settings from a spec-string which is composed of one or
        more of the following comma separated elements:
-    
+
           bold                    turns on bold
           italic                  turns on italics
           fore:[name or \#RRGGBB]  sets the foreground colour
@@ -353,6 +353,64 @@ public:
     */
     void AnnotationClearLine(int line);
 
+    /**
+       Define a marker with a wxBitmap.
+    */
+    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
+
+    /**
+       Register an image for use in autocompletion lists.
+    */
+    void RegisterImage(int type, const wxBitmap& bmp);
+
+    /**
+       Set the colours used to display the items in an autocompletion list.
+
+       This method can be used if the default colours make the list hard to
+       read or if specific colours are desired for whatever reason.
+        @param background
+            The colour used for the background of the list.
+        @param text
+            The colour used for all text except for the selected item.
+        @param highlight
+            The colour used to highlight the selected item in the list.
+        @param highlightText
+            The colour used for the text of the selected item.
+        @remarks
+            To reset one or more of the colours to its default,
+            call this method with wxNullColour for the colour or colours
+            to be reset.
+
+        @since 3.1.3
+    */
+    void AutoCompSetColours(const wxColour& background, const wxColour& text,
+                            const wxColour& highlight,
+                            const wxColour& highlightText);
+                            
+    /**
+       Use a wxListCtrl to display autocompletion and user lists.
+
+       By default lists will be displayed in a wxListBox. Use this method to
+       display them in a wxListCtrl instead. The primary difference is that
+       wxListCtrl has hot tracking to highlight the item under the mouse cursor.
+        @param useListCtrl
+            Set this to true to use a wxListCtrl and to false to use a
+            wxListBox.
+        @param currentBgColour
+            The colour used to highlight the item under the mouse cursor.
+        @param currentTextColour
+            The colour used for the text of the item under the mouse cursor.
+        @remarks
+            To reset one or more of the colours to its default,
+            call this method with wxNullColour for the colour or colours
+            to be reset.
+
+        @since 3.1.3
+    */
+    void AutoCompUseListCtrl(bool useListCtrl = true,
+                             const wxColour& currentBgColour = wxNullColour,
+                             const wxColour& currentTextColour = wxNullColour);
+
     //@}
 
 
diff --git a/src/univ/stdrend.cpp b/src/univ/stdrend.cpp
index 33db222a99..1d984d256e 100644
--- a/src/univ/stdrend.cpp
+++ b/src/univ/stdrend.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxStdRenderer
 // Author:      Vadim Zeitlin
 // Created:     2006-09-16
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/unix/apptraits.cpp b/src/unix/apptraits.cpp
index ba2c94629e..3cd391f094 100644
--- a/src/unix/apptraits.cpp
+++ b/src/unix/apptraits.cpp
@@ -3,7 +3,7 @@
 // Purpose:     implementation of wxGUIAppTraits for Unix systems
 // Author:      Vadim Zeitlin
 // Created:     2008-03-22
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -40,7 +40,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
     // prepare to wait for the child termination: show to the user that we're
     // busy and refuse all input unless explicitly told otherwise
     wxBusyCursor bc;
-    wxWindowDisabler wd(!(execData.flags & wxEXEC_NODISABLE));
+    wxWindowDisabler wd(!(execData.m_flags & wxEXEC_NODISABLE));
 
     // Allocate an event loop that will be used to wait for the process
     // to terminate, will handle stdout, stderr, and any other events and pass
diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index e9612b6152..1a00d15463 100644
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -279,6 +279,14 @@ private:
 
 
 wxDialUpManagerImpl::wxDialUpManagerImpl()
+   : m_BeaconHost(WXDIALUP_MANAGER_DEFAULT_BEACONHOST)
+#ifdef __SGI__
+   , m_ConnectCommand("/usr/etc/ppp")
+#elif defined(__LINUX__)
+   // default values for Debian/GNU linux
+   , m_ConnectCommand("pon")
+   , m_HangUpCommand("poff")
+#endif
 {
    m_IsOnline =
    m_connCard = Net_Unknown;
@@ -286,17 +294,8 @@ wxDialUpManagerImpl::wxDialUpManagerImpl()
    m_timer = NULL;
    m_CanUseIfconfig = -1; // unknown
    m_CanUsePing = -1; // unknown
-   m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
    m_BeaconPort = 80;
 
-#ifdef __SGI__
-   m_ConnectCommand = wxT("/usr/etc/ppp");
-#elif defined(__LINUX__)
-   // default values for Debian/GNU linux
-   m_ConnectCommand = wxT("pon");
-   m_HangUpCommand = wxT("poff");
-#endif
-
    wxChar * dial = wxGetenv(wxT("WXDIALUP_DIALCMD"));
    wxChar * hup = wxGetenv(wxT("WXDIALUP_HUPCMD"));
    SetConnectCommand(dial ? wxString(dial) : m_ConnectCommand,
diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index 79fd2a6cbd..ab057419e5 100644
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-16 (extracted from common/dynlib.cpp)
-// Copyright:   (c) 2000-2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2000-2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/unix/glx11.cpp b/src/unix/glx11.cpp
index e7c2eeef72..61c0a55f85 100644
--- a/src/unix/glx11.cpp
+++ b/src/unix/glx11.cpp
@@ -3,7 +3,7 @@
 // Purpose:     code common to all X11-based wxGLCanvas implementations
 // Author:      Vadim Zeitlin
 // Created:     2007-04-15
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/unix/net.cpp b/src/unix/net.cpp
index 0eb922ab14..0c3b22ee18 100644
--- a/src/unix/net.cpp
+++ b/src/unix/net.cpp
@@ -64,11 +64,11 @@ class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
 {
 public:
    wxDialUpManagerImpl()
+        : m_BeaconHost(WXDIALUP_MANAGER_DEFAULT_BEACONHOST)
       {
          m_IsOnline = -1; // unknown
          m_timer = NULL;
          m_CanUseIfconfig = -1; // unknown
-         m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
          m_BeaconPort = 80;
       }
 
@@ -185,10 +185,10 @@ public:
    virtual bool Start( int millisecs = -1 )
       { m_started = true; return wxTimer::Start(millisecs, false); }
 
-   virtual void Notify()
+   virtual void Notify() wxOVERRIDE
       { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
 
-   virtual void Stop()
+   virtual void Stop() wxOVERRIDE
       { if ( m_started ) wxTimer::Stop(); }
 public:
    bool m_started;
diff --git a/src/unix/stackwalk.cpp b/src/unix/stackwalk.cpp
index eccb910e11..c30c44d762 100644
--- a/src/unix/stackwalk.cpp
+++ b/src/unix/stackwalk.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-18
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/unix/stdpaths.cpp b/src/unix/stdpaths.cpp
index 4b6140e2f6..a7432d6b21 100644
--- a/src/unix/stdpaths.cpp
+++ b/src/unix/stdpaths.cpp
@@ -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
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index db797e696f..8da80d379b 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -1842,11 +1842,10 @@ void wxThreadModule::OnExit()
 {
     wxASSERT_MSG( wxThread::IsMain(), wxT("only main thread can be here") );
 
-    // are there any threads left which are being deleted right now?
-    size_t nThreadsBeingDeleted;
-
     {
         wxMutexLocker lock( *gs_mutexDeleteThread );
+        // are there any threads left which are being deleted right now?
+        size_t nThreadsBeingDeleted;
         nThreadsBeingDeleted = gs_nThreadsBeingDeleted;
 
         if ( nThreadsBeingDeleted > 0 )
diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 2925c2f968..b4f84fb2e8 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -535,25 +535,25 @@ int BlockUntilChildExit(wxExecuteData& execData)
         stdoutHandler.reset(new wxExecuteFDIOHandler
                                 (
                                     dispatcher,
-                                    execData.fdOut,
-                                    execData.bufOut
+                                    execData.m_fdOut,
+                                    execData.m_bufOut
                                 ));
         stderrHandler.reset(new wxExecuteFDIOHandler
                                 (
                                     dispatcher,
-                                    execData.fdErr,
-                                    execData.bufErr
+                                    execData.m_fdErr,
+                                    execData.m_bufErr
                                 ));
     }
 #endif // wxUSE_STREAMS
 
     // And dispatch until the PID is reset from wxExecuteData::OnExit().
-    while ( execData.pid )
+    while ( execData.m_pid )
     {
         dispatcher.Dispatch();
     }
 
-    return execData.exitcode;
+    return execData.m_exitcode;
 #else // !wxUSE_SELECT_DISPATCHER
     wxFAIL_MSG( wxS("Can't block until child exit without wxSelectDispatcher") );
 
@@ -601,8 +601,8 @@ long wxExecute(const char* const* argv, int flags, wxProcess* process,
     wxScopedPtr<wxExecuteData> execDataPtr(new wxExecuteData);
     wxExecuteData& execData = *execDataPtr;
 
-    execData.flags = flags;
-    execData.process = process;
+    execData.m_flags = flags;
+    execData.m_process = process;
 
     // create pipes for inter process communication
     wxPipe pipeIn,      // stdin
@@ -805,11 +805,11 @@ long wxExecute(const char* const* argv, int flags, wxProcess* process,
 
             if ( flags & wxEXEC_SYNC )
             {
-                execData.bufOut.Init(outStream);
-                execData.bufErr.Init(errStream);
+                execData.m_bufOut.Init(outStream);
+                execData.m_bufErr.Init(errStream);
 
-                execData.fdOut = fdOut;
-                execData.fdErr = fdErr;
+                execData.m_fdOut = fdOut;
+                execData.m_fdErr = fdErr;
             }
         }
 #endif // HAS_PIPE_STREAMS
@@ -1498,8 +1498,8 @@ wxAppTraits::RunLoopUntilChildExit(wxExecuteData& execData,
     // It is possible that wxExecuteData::OnExit() had already been called
     // and reset the PID to 0, in which case we don't need to do anything
     // at all.
-    if ( !execData.pid )
-        return execData.exitcode;
+    if ( !execData.m_pid )
+        return execData.m_exitcode;
 
 #if wxUSE_STREAMS
     // Monitor the child streams if necessary.
@@ -1510,24 +1510,24 @@ wxAppTraits::RunLoopUntilChildExit(wxExecuteData& execData,
     {
         stdoutHandler.reset(new wxExecuteEventLoopSourceHandler
                                 (
-                                    execData.fdOut, execData.bufOut
+                                    execData.m_fdOut, execData.m_bufOut
                                 ));
         stderrHandler.reset(new wxExecuteEventLoopSourceHandler
                                 (
-                                    execData.fdErr, execData.bufErr
+                                    execData.m_fdErr, execData.m_bufErr
                                 ));
     }
 #endif // wxUSE_STREAMS
 
     // Store the event loop in the data associated with the child
     // process so that it could exit the loop when the child exits.
-    execData.syncEventLoop = &loop;
+    execData.m_syncEventLoop = &loop;
 
     // And run it.
     loop.Run();
 
     // The exit code will have been set when the child termination was detected.
-    return execData.exitcode;
+    return execData.m_exitcode;
 }
 
 // ----------------------------------------------------------------------------
@@ -1626,7 +1626,7 @@ void wxExecuteData::OnSomeChildExited(int WXUNUSED(sig))
     }
 }
 
-void wxExecuteData::OnStart(int pid_)
+void wxExecuteData::OnStart(int pid)
 {
     wxCHECK_RET( wxTheApp,
                  wxS("Ensure wxTheApp is set before calling wxExecute()") );
@@ -1640,21 +1640,21 @@ void wxExecuteData::OnStart(int pid_)
 
 
     // Remember the child PID to be able to wait for it later.
-    pid = pid_;
+    m_pid = pid;
 
     // Also save it in wxProcess where it will be accessible to the user code.
-    if ( process )
-        process->SetPid(pid);
+    if ( m_process )
+        m_process->SetPid(m_pid);
 
     // Add this object itself to the list of child processes so that
     // we can check for its termination the next time we get SIGCHLD.
-    ms_childProcesses[pid] = this;
+    ms_childProcesses[m_pid] = this;
 
     // However, if the child exited before we finished setting up above,
     // we may have already missed its SIGCHLD.  So we also do an explicit
     // check here before returning.
     int exitcode;
-    if ( CheckForChildExit(pid, &exitcode) )
+    if ( CheckForChildExit(m_pid, &exitcode) )
     {
         // Handle its termination if it did.
         // This call will implicitly remove it from ms_childProcesses
@@ -1663,18 +1663,18 @@ void wxExecuteData::OnStart(int pid_)
     }
 }
 
-void wxExecuteData::OnExit(int exitcode_)
+void wxExecuteData::OnExit(int exitcode)
 {
     // Remove this process from the hash list of child processes that are
     // still open as soon as possible to ensure we don't process it again even
     // if another SIGCHLD happens.
-    if ( !ms_childProcesses.erase(pid) )
+    if ( !ms_childProcesses.erase(m_pid) )
     {
-        wxFAIL_MSG(wxString::Format(wxS("Data for PID %d not in the list?"), pid));
+        wxFAIL_MSG(wxString::Format(wxS("Data for PID %d not in the list?"), m_pid));
     }
 
 
-    exitcode = exitcode_;
+    m_exitcode = exitcode;
 
 #if wxUSE_STREAMS
     if ( IsRedirected() )
@@ -1682,16 +1682,16 @@ void wxExecuteData::OnExit(int exitcode_)
         // Read the remaining data in a blocking way: this is fine because the
         // child has already exited and hence all the data must be already
         // available in the streams buffers.
-        bufOut.ReadAll();
-        bufErr.ReadAll();
+        m_bufOut.ReadAll();
+        m_bufErr.ReadAll();
     }
 #endif // wxUSE_STREAMS
 
     // Notify user about termination if required
-    if ( !(flags & wxEXEC_SYNC) )
+    if ( !(m_flags & wxEXEC_SYNC) )
     {
-        if ( process )
-            process->OnTerminate(pid, exitcode);
+        if ( m_process )
+            m_process->OnTerminate(m_pid, m_exitcode);
 
         // in case of asynchronous execution we don't need this object any more
         // after the child terminates
@@ -1700,10 +1700,10 @@ void wxExecuteData::OnExit(int exitcode_)
     else // sync execution
     {
         // let wxExecute() know that the process has terminated
-        pid = 0;
+        m_pid = 0;
 
         // Stop the event loop for synchronous wxExecute() if we're running one.
-        if ( syncEventLoop )
-            syncEventLoop->ScheduleExit();
+        if ( m_syncEventLoop )
+            m_syncEventLoop->ScheduleExit();
     }
 }
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 626269dfd7..e9f79143a9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -223,6 +223,7 @@ TEST_GUI_OBJECTS =  \
 	test_gui_slidertest.o \
 	test_gui_spinctrldbltest.o \
 	test_gui_spinctrltest.o \
+	test_gui_styledtextctrltest.o \
 	test_gui_textctrltest.o \
 	test_gui_textentrytest.o \
 	test_gui_togglebuttontest.o \
@@ -330,6 +331,9 @@ TEST_GUI_ODEP =  $(_____pch_testprec_test_gui_testprec_h_gch___depname)
 COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0_USE_WEBVIEW_1@__WXLIB_WEBVIEW_p = $(COND_MONOLITHIC_0_USE_WEBVIEW_1___WXLIB_WEBVIEW_p)
+COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_USE_STC_1@__WXLIB_STC_p = $(COND_MONOLITHIC_0_USE_STC_1___WXLIB_STC_p)
 COND_MONOLITHIC_0___WXLIB_AUI_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
@@ -424,7 +428,7 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_SHARED_1_USE_GUI_1@	$(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p test_gui.app/Contents
@@ -943,6 +947,9 @@ test_gui_spinctrldbltest.o: $(srcdir)/controls/spinctrldbltest.cpp $(TEST_GUI_OD
 test_gui_spinctrltest.o: $(srcdir)/controls/spinctrltest.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/spinctrltest.cpp
 
+test_gui_styledtextctrltest.o: $(srcdir)/controls/styledtextctrltest.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/styledtextctrltest.cpp
+
 test_gui_textctrltest.o: $(srcdir)/controls/textctrltest.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/controls/textctrltest.cpp
 
diff --git a/tests/controls/radiobuttontest.cpp b/tests/controls/radiobuttontest.cpp
index df50b969f5..535cc17e25 100644
--- a/tests/controls/radiobuttontest.cpp
+++ b/tests/controls/radiobuttontest.cpp
@@ -16,7 +16,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/button.h"
+    #include "wx/panel.h"
     #include "wx/radiobut.h"
+    #include "wx/sizer.h"
     #include "wx/stattext.h"
 #endif // WX_PRECOMP
 
@@ -195,4 +198,58 @@ void RadioButtonTestCase::Single()
     CHECK(ngradio->GetValue());
 }
 
+TEST_CASE("wxRadioButton::Focus", "[radiobutton][focus]")
+{
+    // Create a container panel just to be able to destroy all the windows
+    // created here at once by simply destroying it.
+    wxWindow* const tlw = wxTheApp->GetTopWindow();
+    wxScopedPtr<wxPanel> parentPanel(new wxPanel(tlw));
+
+    // Create a panel containing 2 radio buttons and another control outside
+    // this panel, so that we could give focus to something different and then
+    // return it back to the panel.
+    wxPanel* const radioPanel = new wxPanel(parentPanel.get());
+    wxRadioButton* const radio1 = new wxRadioButton(radioPanel, wxID_ANY, "1");
+    wxRadioButton* const radio2 = new wxRadioButton(radioPanel, wxID_ANY, "2");
+    wxSizer* const radioSizer = new wxBoxSizer(wxHORIZONTAL);
+    radioSizer->Add(radio1);
+    radioSizer->Add(radio2);
+    radioPanel->SetSizer(radioSizer);
+
+    wxButton* const dummyButton = new wxButton(parentPanel.get(), wxID_OK);
+
+    wxSizer* const sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(radioPanel, wxSizerFlags(1).Expand());
+    sizer->Add(dummyButton, wxSizerFlags().Expand());
+    parentPanel->SetSizer(sizer);
+
+    parentPanel->SetSize(tlw->GetClientSize());
+    parentPanel->Layout();
+
+    // Initially the first radio button should be checked.
+    radio1->SetFocus();
+    CHECK(radio1->GetValue());
+    CHECK(wxWindow::FindFocus() == radio1);
+
+    // Switching focus from it shouldn't change this.
+    dummyButton->SetFocus();
+    CHECK(radio1->GetValue());
+
+    // Checking another radio button should make it checked and uncheck the
+    // first one.
+    radio2->SetValue(true);
+    CHECK(!radio1->GetValue());
+    CHECK(radio2->GetValue());
+
+    // While not changing focus.
+    CHECK(wxWindow::FindFocus() == dummyButton);
+
+    // And giving the focus to the panel shouldn't change radio button
+    // selection.
+    radioPanel->SetFocus();
+    CHECK(wxWindow::FindFocus() == radio2);
+    CHECK(!radio1->GetValue());
+    CHECK(radio2->GetValue());
+}
+
 #endif //wxUSE_RADIOBTN
diff --git a/tests/controls/styledtextctrltest.cpp b/tests/controls/styledtextctrltest.cpp
new file mode 100644
index 0000000000..63c8610cb6
--- /dev/null
+++ b/tests/controls/styledtextctrltest.cpp
@@ -0,0 +1,157 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/controls/styledtextctrltest.cpp
+// Purpose:     wxStyledTextCtrl unit test
+// Author:      New Pagodi
+// Created:     2019-03-10
+// Copyright:   (c) 2019 wxWidgets development team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#include "testprec.h"
+
+#if wxUSE_STC
+
+#if WXUSINGDLL
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
+#include "wx/stc/stc.h"
+#include "wx/uiaction.h"
+
+#if defined(__WXOSX_COCOA__) || defined(__WXMSW__) || defined(__WXGTK__)
+
+class StcPopupWindowsTestCase
+{
+public:
+    StcPopupWindowsTestCase()
+        : m_stc(new wxStyledTextCtrl(wxTheApp->GetTopWindow(), wxID_ANY))
+    {
+        m_focusAlwaysRetained=true;
+        m_calltipClickReceived=false;
+
+        m_stc->Bind(wxEVT_KILL_FOCUS,
+                    &StcPopupWindowsTestCase::OnKillSTCFocus, this);
+        m_stc->Bind(wxEVT_STC_CALLTIP_CLICK,
+                    &StcPopupWindowsTestCase::OnCallTipClick, this);
+    }
+
+    ~StcPopupWindowsTestCase()
+    {
+        delete m_stc;
+    }
+
+    void OnKillSTCFocus(wxFocusEvent& WXUNUSED(event))
+    {
+        m_focusAlwaysRetained=false;
+    }
+
+    void OnCallTipClick(wxStyledTextEvent& WXUNUSED(event))
+    {
+        m_calltipClickReceived=true;
+    }
+
+protected:
+    wxStyledTextCtrl* const m_stc;
+    bool m_focusAlwaysRetained;
+    bool m_calltipClickReceived;
+};
+
+// This set of tests is used to verify that an autocompletion popup does not
+// take focus from its parent styled text control.
+TEST_CASE_METHOD(StcPopupWindowsTestCase,
+                 "wxStyledTextCtrl::AutoComp",
+                 "[wxStyledTextCtrl][focus]")
+{
+    m_stc->SetFocus();
+    m_focusAlwaysRetained = true;
+    m_stc->AutoCompShow(0,"ability able about above abroad absence absent");
+
+#if wxUSE_UIACTIONSIMULATOR
+    // Pressing the tab key should cause the current entry in the list to be
+    // entered into the styled text control. However with GTK+, characters sent
+    // with the UI simulator seem to arrive too late, so select the current
+    // entry with a double click instead.
+
+    wxUIActionSimulator sim;
+
+#ifdef __WXGTK__
+    wxPoint zeroPosition = m_stc->PointFromPosition(0);
+    int textHt = m_stc->TextHeight(0);
+    int textWd = m_stc->TextWidth(0,"ability");
+    wxPoint autoCompPoint(zeroPosition.x + textWd/2,
+                            zeroPosition.y + textHt + textHt/2);
+    wxPoint scrnPoint = m_stc->ClientToScreen(autoCompPoint);
+    sim.MouseMove(scrnPoint);
+    sim.MouseDblClick();
+#else
+    sim.Char(WXK_TAB);
+#endif // __WXGTK__
+    ::wxYield();
+    CHECK( m_stc->GetText() == "ability" );
+#endif //wxUSE_UIACTIONSIMULATOR
+
+    if ( m_stc->AutoCompActive() )
+        m_stc->AutoCompCancel();
+
+    CHECK( m_stc->HasFocus() );
+    CHECK( m_focusAlwaysRetained );
+}
+
+// This test is used to verify that a call tip receives mouse clicks. However
+// the clicks do sent with the UI simulator do not seem to be received on 
+// cocoa for some reason, so skip the test there for now.
+#if !defined(__WXOSX_COCOA__)
+TEST_CASE_METHOD(StcPopupWindowsTestCase,
+                 "wxStyledTextCtrl::Calltip",
+                 "[wxStyledTextCtrl][focus]")
+{
+    m_stc->SetFocus();
+    m_calltipClickReceived = false;
+    m_focusAlwaysRetained = true;
+
+    wxString calltipText = "This is a calltip.";
+    m_stc->CallTipShow(0,calltipText);
+
+#if wxUSE_UIACTIONSIMULATOR
+    wxUIActionSimulator sim;
+    wxPoint zeroPosition = m_stc->PointFromPosition(0);
+    int textHt = m_stc->TextHeight(0);
+    int textWd = m_stc->TextWidth(0,calltipText);
+
+    // zeroPosition is the top left of position 0 and the call tip should have
+    // roughly the same height as textHt (there seems to be some extra padding
+    // that makes it a little taller, but it's roughly the same height),
+    // so (zeroPosition.x+textWd/2,zeroPosition.y+textHt+textHt/2) should
+    // be the middle of the calltip.
+    wxPoint calltipMidPoint(zeroPosition.x + textWd/2,
+                            zeroPosition.y + textHt + textHt/2);
+    wxPoint scrnPoint = m_stc->ClientToScreen(calltipMidPoint);
+    sim.MouseMove(scrnPoint);
+    sim.MouseClick();
+    ::wxYield();
+
+    CHECK( m_calltipClickReceived );
+#endif // wxUSE_UIACTIONSIMULATOR
+
+    if ( m_stc->CallTipActive() )
+        m_stc->CallTipCancel();
+
+    // Verify that clicking the call tip did not take focus from the STC.
+    CHECK( m_stc->HasFocus() );
+    CHECK( m_focusAlwaysRetained );
+}
+
+#endif // !defined(__WXOSX_COCOA__)
+
+#endif // defined(__WXOSX_COCOA__) || defined(__WXMSW__) || defined(__WXGTK__)
+
+#endif // WXUSINGDLL
+
+#endif // wxUSE_STC
+
diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index b053e80489..0bda950169 100644
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -165,6 +165,12 @@ void TextEntryTestCase::InsertionPoint()
     CPPUNIT_ASSERT_EQUAL( 3, entry->GetLastPosition() );
     CPPUNIT_ASSERT_EQUAL( 1, entry->GetInsertionPoint() );
 
+    entry->SetValue("012"); // shouldn't change the position if no real change
+    CPPUNIT_ASSERT_EQUAL( 1, entry->GetInsertionPoint() );
+
+    entry->ChangeValue("012"); // same as for SetValue()
+    CPPUNIT_ASSERT_EQUAL( 1, entry->GetInsertionPoint() );
+
     entry->SetInsertionPointEnd();
     CPPUNIT_ASSERT_EQUAL( 3, entry->GetInsertionPoint() );
 
diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index f4755e7c3f..14df03153a 100644
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxDateTime unit test
 // Author:      Vadim Zeitlin
 // Created:     2004-06-23 (extracted from samples/console/console.cpp)
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
diff --git a/tests/descrip.mms b/tests/descrip.mms
index d448c7095a..cb3b80f367 100644
--- a/tests/descrip.mms
+++ b/tests/descrip.mms
@@ -184,6 +184,7 @@ TEST_GUI_OBJECTS2=test_gui_richtextctrltest.obj,\
 	test_gui_slidertest.obj,\
 	test_gui_spinctrldbltest.obj,\
 	test_gui_spinctrltest.obj,\
+	test_gui_styledtextctrltest.obj,\
 	test_gui_textctrltest.obj,\
 	test_gui_textentrytest.obj,\
 	test_gui_togglebuttontest.obj,\
@@ -617,6 +618,9 @@ test_gui_spinctrldbltest.obj : [.controls]spinctrldbltest.cpp
 test_gui_spinctrltest.obj : [.controls]spinctrltest.cpp 
 	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]spinctrltest.cpp
 
+test_gui_styledtextctrltest.obj : [.controls]styledtextctrltest.cpp 
+	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]styledtextctrltest.cpp
+
 test_gui_textctrltest.obj : [.controls]textctrltest.cpp 
 	$(CXXC) /object=[]$@ $(TEST_GUI_CXXFLAGS) [.controls]textctrltest.cpp
 
diff --git a/tests/exec/exec.cpp b/tests/exec/exec.cpp
index f350376043..bb82e4c059 100644
--- a/tests/exec/exec.cpp
+++ b/tests/exec/exec.cpp
@@ -516,3 +516,28 @@ void ExecTestCase::TestOverlappedSyncExecute()
     CPPUNIT_ASSERT_EQUAL( SLEEP_END_STRING, longSleepOutput.Last() );
 #endif // !__WINDOWS__
 }
+
+#ifdef __UNIX__
+
+// This test is disabled by default because it must be run in French locale,
+// i.e. with explicit LC_ALL=fr_FR.UTF-8 and only works with GNU ls, which
+// produces the expected output.
+TEST_CASE("wxExecute::RedirectUTF8", "[exec][unicode][.]")
+{
+    wxArrayString output;
+    REQUIRE( wxExecute("/bin/ls --version", output) == 0 );
+
+    for ( size_t n = 0; n < output.size(); ++n )
+    {
+        // It seems unlikely that this part of the output will change for GNU
+        // ls, so check for its presence as a sign that the program output was
+        // decoded correctly.
+        if ( output[n].find(wxString::FromUTF8("vous \xc3\xaates libre")) != wxString::npos )
+            return;
+    }
+
+    INFO("output was:\n" << wxJoin(output, '\n'));
+    FAIL("Expected output fragment not found.");
+}
+
+#endif // __UNIX__
diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index 95a9482301..75decc1cf0 100644
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -25,20 +25,13 @@
 #include "wx/evtloop.h"
 #include "wx/filename.h"
 #include "wx/filefn.h"
-#include "wx/stdpaths.h"
 #include "wx/fswatcher.h"
+#include "wx/scopedptr.h"
+#include "wx/stdpaths.h"
+#include "wx/vector.h"
 
 #include "testfile.h"
 
-/*
-This test used to be disabled on OS X as it hung. Work around the apparent
-wxOSX differences between a non-GUI event loop and a GUI event loop (where
-the tests do run fine) until this gets resolved.
-*/
-#ifdef __WXOSX__
-    #define OSX_EVENT_LOOP_WORKAROUND
-#endif
-
 // ----------------------------------------------------------------------------
 // local functions
 // ----------------------------------------------------------------------------
@@ -71,7 +64,7 @@ public:
 
     bool RenameFile()
     {
-        CPPUNIT_ASSERT(m_file.FileExists());
+        REQUIRE(m_file.FileExists());
 
         wxLogDebug("Renaming %s=>%s", m_file.GetFullPath(), m_new.GetFullPath());
 
@@ -88,7 +81,7 @@ public:
 
     bool DeleteFile()
     {
-        CPPUNIT_ASSERT(m_file.FileExists());
+        REQUIRE(m_file.FileExists());
 
         bool ret =  wxRemoveFile(m_file.GetFullPath());
         if (ret)
@@ -109,23 +102,23 @@ public:
     bool ReadFile()
     {
         wxFile f(m_file.GetFullPath());
-        CPPUNIT_ASSERT(f.IsOpened());
+        REQUIRE(f.IsOpened());
 
         char buf[1];
         ssize_t count = f.Read(buf, sizeof(buf));
-        CPPUNIT_ASSERT(count > 0);
+        CHECK(count > 0);
 
         return true;
     }
 
     bool ModifyFile()
     {
-        CPPUNIT_ASSERT(m_file.FileExists());
+        REQUIRE(m_file.FileExists());
 
         wxFile file(m_file.GetFullPath(), wxFile::write_append);
-        CPPUNIT_ASSERT(file.IsOpened());
+        REQUIRE(file.IsOpened());
 
-        CPPUNIT_ASSERT(file.Write("Words of Wisdom, Lloyd. Words of wisdom\n"));
+        CHECK(file.Write("Words of Wisdom, Lloyd. Words of wisdom\n"));
         return file.Close();
     }
 
@@ -149,8 +142,8 @@ public:
         // XXX look for more unique name? there is no function to generate
         // unique filename, the file always get created...
         dir.AppendDir("fswatcher_test");
-        CPPUNIT_ASSERT(!dir.DirExists());
-        CPPUNIT_ASSERT(dir.Mkdir());
+        REQUIRE(!dir.DirExists());
+        REQUIRE(dir.Mkdir());
 
         return dir;
     }
@@ -158,12 +151,12 @@ public:
     static void RemoveWatchDir()
     {
         wxFileName dir = GetWatchDir();
-        CPPUNIT_ASSERT(dir.DirExists());
+        REQUIRE(dir.DirExists());
 
         // just to be really sure we know what we remove
-        CPPUNIT_ASSERT_EQUAL( "fswatcher_test", dir.GetDirs().Last() );
+        REQUIRE( dir.GetDirs().Last() == "fswatcher_test" );
 
-        CPPUNIT_ASSERT( dir.Rmdir(wxPATH_RMDIR_RECURSIVE) );
+        CHECK( dir.Rmdir(wxPATH_RMDIR_RECURSIVE) );
     }
 
     static wxFileName RandomName(const wxFileName& base, int length = 10)
@@ -193,45 +186,34 @@ protected:
 EventGenerator* EventGenerator::ms_instance = 0;
 
 
-// custom event handler
-class EventHandler : public wxEvtHandler
+// Abstract base class from which concrete event tests inherit.
+//
+// This class provides the common test skeleton which various virtual hooks
+// that should or can be reimplemented by the derived classes.
+class FSWTesterBase : public wxEvtHandler
 {
 public:
-    enum { WAIT_DURATION = 3 };
-
-    EventHandler(int types = wxFSW_EVENT_ALL) :
-        eg(EventGenerator::Get()), m_loop(0),
-#ifdef OSX_EVENT_LOOP_WORKAROUND
-        m_loopActivator(NULL),
-#endif
-        m_count(0), m_watcher(0), m_eventTypes(types)
+    FSWTesterBase(int types = wxFSW_EVENT_ALL) :
+        eg(EventGenerator::Get()),
+        m_eventTypes(types)
     {
-        m_loop = new wxEventLoop();
-#ifdef OSX_EVENT_LOOP_WORKAROUND
-        m_loopActivator = new wxEventLoopActivator(m_loop);
-#endif
-        Connect(wxEVT_IDLE, wxIdleEventHandler(EventHandler::OnIdle));
-        Connect(wxEVT_FSWATCHER, wxFileSystemWatcherEventHandler(
-                                            EventHandler::OnFileSystemEvent));
+        Bind(wxEVT_FSWATCHER, &FSWTesterBase::OnFileSystemEvent, this);
+
+        // wxFileSystemWatcher can be created only once the event loop is
+        // running, so we can't do it from here and will do it from inside the
+        // loop when this event handler is invoked.
+        CallAfter(&FSWTesterBase::OnIdleInit);
     }
 
-    virtual ~EventHandler()
+    virtual ~FSWTesterBase()
     {
-        delete m_watcher;
-#ifdef OSX_EVENT_LOOP_WORKAROUND
-        delete m_loopActivator;
-#endif
-        if (m_loop)
-        {
-            if (m_loop->IsRunning())
-                m_loop->Exit();
-            delete m_loop;
-        }
+        if (m_loop.IsRunning())
+            m_loop.Exit();
     }
 
     void Exit()
     {
-        m_loop->Exit();
+        m_loop.Exit();
     }
 
     // sends idle event, so we get called in a moment
@@ -239,140 +221,73 @@ public:
     {
         wxIdleEvent* e = new wxIdleEvent();
         QueueEvent(e);
-
-#ifdef OSX_EVENT_LOOP_WORKAROUND
-        // The fs watcher test cases will hang on OS X if Yield() is not called.
-        // It seems that the OS X event loop and / or queueing behaves
-        // differently than on MSW and Linux.
-        m_loop->Yield(true);
-#endif
     }
 
     void Run()
     {
-        SendIdle();
-        m_loop->Run();
+        m_loop.Run();
     }
 
-    void OnIdle(wxIdleEvent& /*evt*/)
+    void OnIdleInit()
     {
-        bool more = Action();
-        m_count++;
+        REQUIRE(Init());
 
-        if (more)
-        {
-            SendIdle();
-        }
+        GenerateEvent();
+
+        // Check the result when the next idle event comes: note that we can't
+        // use CallAfter() here, unfortunately, because OnIdleCheckResult()
+        // would then be called immediately, from the same event loop iteration
+        // as we're called from, because the idle/pending events are processed
+        // for as long as there any. Instead, we need to return to the event
+        // loop itself to give it a chance to dispatch wxFileSystemWatcherEvent
+        // and wait until our handler for it calls SendIdle() which will then
+        // end up calling OnIdleCheckResult() afterwards.
+        Bind(wxEVT_IDLE, &FSWTesterBase::OnIdleCheckResult, this);
     }
 
-    // returns whether we should produce more idle events
-    virtual bool Action()
+    void OnIdleCheckResult(wxIdleEvent& WXUNUSED(event))
     {
-        switch (m_count)
-        {
-        case 0:
-            CPPUNIT_ASSERT(Init());
-            break;
-        case 1:
-            GenerateEvent();
-            break;
-        case 2:
-            // actual test
-            CheckResult();
-            Exit();
-            break;
+        Unbind(wxEVT_IDLE, &FSWTesterBase::OnIdleCheckResult, this);
 
-        // TODO a mechanism that will break the loop in case we
-        // don't receive a file system event
-        // this below doesn't quite work, so all tests must pass :-)
-#if 0
-        case 2:
-            m_loop.Yield();
-            m_loop.WakeUp();
-            CPPUNIT_ASSERT(KeepWaiting());
-            m_loop.Yield();
-            break;
-        case 3:
-            break;
-        case 4:
-            CPPUNIT_ASSERT(AfterWait());
-            break;
-#endif
-        } // switch (m_count)
-
-        return m_count <= 0;
+        CheckResult();
+        Exit();
     }
 
     virtual bool Init()
     {
         // test we're good to go
-        CPPUNIT_ASSERT(wxEventLoopBase::GetActive());
+        CHECK(wxEventLoopBase::GetActive());
 
         // XXX only now can we construct Watcher, because we need
         // active loop here
-        m_watcher = new wxFileSystemWatcher();
+        m_watcher.reset(new wxFileSystemWatcher());
         m_watcher->SetOwner(this);
 
         // add dir to be watched
         wxFileName dir = EventGenerator::GetWatchDir();
-        CPPUNIT_ASSERT(m_watcher->Add(dir, m_eventTypes));
+        CHECK(m_watcher->Add(dir, m_eventTypes));
 
         return true;
     }
 
-    virtual bool KeepWaiting()
-    {
-        // did we receive event already?
-        if (!tested)
-        {
-            // well, let's wait a bit more
-            wxSleep(WAIT_DURATION);
-        }
-
-        return true;
-    }
-
-    virtual bool AfterWait()
-    {
-        // fail if still no events
-        WX_ASSERT_MESSAGE
-        (
-             ("No events during %d seconds!", static_cast<int>(WAIT_DURATION)),
-             tested
-        );
-
-        return true;
-    }
-
-    virtual void OnFileSystemEvent(wxFileSystemWatcherEvent& evt)
-    {
-        wxLogDebug("--- %s ---", evt.ToString());
-        m_lastEvent = wxDynamicCast(evt.Clone(), wxFileSystemWatcherEvent);
-        m_events.Add(m_lastEvent);
-
-        // test finished
-        SendIdle();
-        tested = true;
-    }
-
     virtual void CheckResult()
     {
-        CPPUNIT_ASSERT_MESSAGE( "No events received", !m_events.empty() );
+        REQUIRE( !m_events.empty() );
 
         const wxFileSystemWatcherEvent * const e = m_events.front();
 
         // this is our "reference event"
         const wxFileSystemWatcherEvent expected = ExpectedEvent();
 
-        CPPUNIT_ASSERT_EQUAL( expected.GetChangeType(), e->GetChangeType() );
+        CHECK( e->GetChangeType() == expected.GetChangeType() );
 
-        CPPUNIT_ASSERT_EQUAL((int)wxEVT_FSWATCHER, e->GetEventType());
+        CHECK( e->GetEventType() == wxEVT_FSWATCHER );
 
         // XXX this needs change
-        CPPUNIT_ASSERT_EQUAL(wxEVT_CATEGORY_UNKNOWN, e->GetEventCategory());
+        CHECK( e->GetEventCategory() == wxEVT_CATEGORY_UNKNOWN );
 
-        CPPUNIT_ASSERT_EQUAL(expected.GetPath(), e->GetPath());
-        CPPUNIT_ASSERT_EQUAL(expected.GetNewPath(), e->GetNewPath());
+        CHECK( e->GetPath() == expected.GetPath() );
+        CHECK( e->GetNewPath() == expected.GetNewPath() );
 
         // Under MSW extra modification events are sometimes reported after a
         // rename and we just can't get rid of them, so ignore them in this
@@ -412,121 +327,64 @@ public:
 
 protected:
     EventGenerator& eg;
-    wxEventLoopBase* m_loop;    // loop reference
-#ifdef OSX_EVENT_LOOP_WORKAROUND
-    wxEventLoopActivator* m_loopActivator;
-#endif
-    int m_count;                // idle events count
+    wxEventLoop m_loop;    // loop reference
+
+    wxScopedPtr<wxFileSystemWatcher> m_watcher;
 
-    wxFileSystemWatcher* m_watcher;
     int m_eventTypes;  // Which event-types to watch. Normally all of them
-    bool tested;  // indicates, whether we have already passed the test
 
-    #include "wx/arrimpl.cpp"
-    WX_DEFINE_ARRAY_PTR(wxFileSystemWatcherEvent*, wxArrayEvent);
-    wxArrayEvent m_events;
-    wxFileSystemWatcherEvent* m_lastEvent;
-};
-
-
-// ----------------------------------------------------------------------------
-// test class
-// ----------------------------------------------------------------------------
-
-class FileSystemWatcherTestCase : public CppUnit::TestCase
-{
-public:
-    FileSystemWatcherTestCase() { }
-
-    virtual void setUp() wxOVERRIDE;
-    virtual void tearDown() wxOVERRIDE;
-
-protected:
-    wxEventLoopBase* m_loop;
+    wxVector<wxFileSystemWatcherEvent*> m_events;
 
 private:
-    CPPUNIT_TEST_SUITE( FileSystemWatcherTestCase );
-        CPPUNIT_TEST( TestEventCreate );
-        CPPUNIT_TEST( TestEventDelete );
-        CPPUNIT_TEST( TestTrees );
+    void OnFileSystemEvent(wxFileSystemWatcherEvent& evt)
+    {
+        wxLogDebug("--- %s ---", evt.ToString());
+        m_events.push_back(wxDynamicCast(evt.Clone(), wxFileSystemWatcherEvent));
 
-        // kqueue-based implementation doesn't collapse create/delete pairs in
-        // renames and doesn't detect neither modifications nor access to the
-        // files reliably currently so disable these tests
-        //
-        // FIXME: fix the code and reenable them
-#ifndef wxHAS_KQUEUE
-        CPPUNIT_TEST( TestEventRename );
-        CPPUNIT_TEST( TestEventModify );
-
-        // MSW implementation doesn't detect file access events currently
-#ifndef __WINDOWS__
-        CPPUNIT_TEST( TestEventAccess );
-#endif // __WINDOWS__
-#endif // !wxHAS_KQUEUE
-
-#ifdef wxHAS_INOTIFY
-        CPPUNIT_TEST( TestEventAttribute );
-        CPPUNIT_TEST( TestSingleWatchtypeEvent );
-#endif // wxHAS_INOTIFY
-
-        CPPUNIT_TEST( TestNoEventsAfterRemove );
-    CPPUNIT_TEST_SUITE_END();
-
-    void TestEventCreate();
-    void TestEventDelete();
-    void TestEventRename();
-    void TestEventModify();
-    void TestEventAccess();
-#ifdef wxHAS_INOTIFY
-    void TestEventAttribute();
-    void TestSingleWatchtypeEvent();
-#endif // wxHAS_INOTIFY
-    void TestTrees();
-    void TestNoEventsAfterRemove();
-
-    wxDECLARE_NO_COPY_CLASS(FileSystemWatcherTestCase);
+        // test finished
+        SendIdle();
+    }
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( FileSystemWatcherTestCase );
 
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FileSystemWatcherTestCase,
-                                        "FileSystemWatcherTestCase" );
+// ----------------------------------------------------------------------------
+// test fixture
+// ----------------------------------------------------------------------------
 
-void FileSystemWatcherTestCase::setUp()
+class FileSystemWatcherTestCase
 {
-    wxLog::AddTraceMask(wxTRACE_FSWATCHER);
+public:
+    FileSystemWatcherTestCase()
+    {
+        // Before each test, remove the dir if it exists.
+        // It would exist if the previous test run was aborted.
+        wxString tmp = wxStandardPaths::Get().GetTempDir();
+        wxFileName dir;
+        dir.AssignDir(tmp);
+        dir.AppendDir("fswatcher_test");
+        dir.Rmdir(wxPATH_RMDIR_RECURSIVE);
+        EventGenerator::Get().GetWatchDir();
+    }
 
-    // Before each test, remove the dir if it exists.
-    // It would exist if the previous test run was aborted.
-    wxString tmp = wxStandardPaths::Get().GetTempDir();
-    wxFileName dir;
-    dir.AssignDir(tmp);
-    dir.AppendDir("fswatcher_test");
-    dir.Rmdir(wxPATH_RMDIR_RECURSIVE);
-    EventGenerator::Get().GetWatchDir();
-}
-
-void FileSystemWatcherTestCase::tearDown()
-{
-    EventGenerator::Get().RemoveWatchDir();
-}
+    ~FileSystemWatcherTestCase()
+    {
+        EventGenerator::Get().RemoveWatchDir();
+    }
+};
 
 // ----------------------------------------------------------------------------
 // TestEventCreate
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestEventCreate()
-{
-    wxLogDebug("TestEventCreate()");
 
-    class EventTester : public EventHandler
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::EventCreate", "[fsw]")
+{
+    class EventTester : public FSWTesterBase
     {
     public:
         virtual void GenerateEvent() wxOVERRIDE
         {
-            CPPUNIT_ASSERT(eg.CreateFile());
+            CHECK(eg.CreateFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -540,24 +398,22 @@ void FileSystemWatcherTestCase::TestEventCreate()
 
     EventTester tester;
 
-    wxLogTrace(wxTRACE_FSWATCHER, "TestEventCreate tester created()");
-
     tester.Run();
 }
 
 // ----------------------------------------------------------------------------
 // TestEventDelete
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestEventDelete()
-{
-    wxLogDebug("TestEventDelete()");
 
-    class EventTester : public EventHandler
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::EventDelete", "[fsw]")
+{
+    class EventTester : public FSWTesterBase
     {
     public:
         virtual void GenerateEvent() wxOVERRIDE
         {
-            CPPUNIT_ASSERT(eg.DeleteFile());
+            CHECK(eg.DeleteFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -578,19 +434,26 @@ void FileSystemWatcherTestCase::TestEventDelete()
     tester.Run();
 }
 
+// kqueue-based implementation doesn't collapse create/delete pairs in
+// renames and doesn't detect neither modifications nor access to the
+// files reliably currently so disable these tests
+//
+// FIXME: fix the code and reenable them
+#ifndef wxHAS_KQUEUE
+
 // ----------------------------------------------------------------------------
 // TestEventRename
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestEventRename()
-{
-    wxLogDebug("TestEventRename()");
 
-    class EventTester : public EventHandler
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::EventRename", "[fsw]")
+{
+    class EventTester : public FSWTesterBase
     {
     public:
         virtual void GenerateEvent() wxOVERRIDE
         {
-            CPPUNIT_ASSERT(eg.RenameFile());
+            CHECK(eg.RenameFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -612,16 +475,16 @@ void FileSystemWatcherTestCase::TestEventRename()
 // ----------------------------------------------------------------------------
 // TestEventModify
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestEventModify()
-{
-    wxLogDebug("TestEventModify()");
 
-    class EventTester : public EventHandler
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::EventModify", "[fsw]")
+{
+    class EventTester : public FSWTesterBase
     {
     public:
         virtual void GenerateEvent() wxOVERRIDE
         {
-            CPPUNIT_ASSERT(eg.ModifyFile());
+            CHECK(eg.ModifyFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -640,19 +503,22 @@ void FileSystemWatcherTestCase::TestEventModify()
     tester.Run();
 }
 
+// MSW implementation doesn't detect file access events currently
+#ifndef __WINDOWS__
+
 // ----------------------------------------------------------------------------
 // TestEventAccess
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestEventAccess()
-{
-    wxLogDebug("TestEventAccess()");
 
-    class EventTester : public EventHandler
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::EventAccess", "[fsw]")
+{
+    class EventTester : public FSWTesterBase
     {
     public:
         virtual void GenerateEvent() wxOVERRIDE
         {
-            CPPUNIT_ASSERT(eg.ReadFile());
+            CHECK(eg.ReadFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -672,20 +538,23 @@ void FileSystemWatcherTestCase::TestEventAccess()
     tester.Run();
 }
 
+#endif // __WINDOWS__
+
+#endif // !wxHAS_KQUEUE
+
 #ifdef wxHAS_INOTIFY
 // ----------------------------------------------------------------------------
 // TestEventAttribute
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestEventAttribute()
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::EventAttribute", "[fsw]")
 {
-    wxLogDebug("TestEventAttribute()");
-
-    class EventTester : public EventHandler
+    class EventTester : public FSWTesterBase
     {
     public:
         virtual void GenerateEvent() wxOVERRIDE
         {
-            CPPUNIT_ASSERT(eg.TouchFile());
+            CHECK(eg.TouchFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -707,24 +576,24 @@ void FileSystemWatcherTestCase::TestEventAttribute()
 // ----------------------------------------------------------------------------
 // TestSingleWatchtypeEvent: Watch only wxFSW_EVENT_ACCESS
 // ----------------------------------------------------------------------------
-void FileSystemWatcherTestCase::TestSingleWatchtypeEvent()
-{
-    wxLogDebug("TestSingleWatchtypeEvent()");
 
-    class EventTester : public EventHandler
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::SingleWatchtypeEvent", "[fsw]")
+{
+    class EventTester : public FSWTesterBase
     {
     public:
         // We could pass wxFSW_EVENT_CREATE or MODIFY instead, but not RENAME or
         // DELETE as the event path fields would be wrong in CheckResult()
-        EventTester() : EventHandler(wxFSW_EVENT_ACCESS) {}
+        EventTester() : FSWTesterBase(wxFSW_EVENT_ACCESS) {}
 
         virtual void GenerateEvent() wxOVERRIDE
         {
             // As wxFSW_EVENT_ACCESS is passed to the ctor only ReadFile() will
             // generate an event. Without it they all will, and the test fails
-            CPPUNIT_ASSERT(eg.CreateFile());
-            CPPUNIT_ASSERT(eg.ModifyFile());
-            CPPUNIT_ASSERT(eg.ReadFile());
+            CHECK(eg.CreateFile());
+            CHECK(eg.ModifyFile());
+            CHECK(eg.ReadFile());
         }
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
@@ -745,9 +614,10 @@ void FileSystemWatcherTestCase::TestSingleWatchtypeEvent()
 // TestTrees
 // ----------------------------------------------------------------------------
 
-void FileSystemWatcherTestCase::TestTrees()
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::Trees", "[fsw]")
 {
-    class TreeTester : public EventHandler
+    class TreeTester : public FSWTesterBase
     {
         const size_t subdirs;
         const size_t files;
@@ -761,10 +631,10 @@ void FileSystemWatcherTestCase::TestTrees()
 #endif
                       )
         {
-            CPPUNIT_ASSERT(dir.Mkdir());
+            REQUIRE(dir.Mkdir());
             // Now add a subdir with an easy name to remember in WatchTree()
             dir.AppendDir("child");
-            CPPUNIT_ASSERT(dir.Mkdir());
+            REQUIRE(dir.Mkdir());
             wxFileName child(dir);  // Create a copy to which to symlink
 
             // Create a branch of 5 numbered subdirs, each containing 3
@@ -772,7 +642,7 @@ void FileSystemWatcherTestCase::TestTrees()
             for ( unsigned d = 0; d < subdirs; ++d )
             {
                 dir.AppendDir(wxString::Format("subdir%u", d+1));
-                CPPUNIT_ASSERT(dir.Mkdir());
+                REQUIRE(dir.Mkdir());
 
                 const wxString prefix = dir.GetPathWithSep();
                 const wxString ext[] = { ".txt", ".log", "" };
@@ -786,12 +656,17 @@ void FileSystemWatcherTestCase::TestTrees()
                 if ( withSymlinks )
                 {
                     // Create a symlink to a files, and another to 'child'
-                    CPPUNIT_ASSERT_EQUAL(0,
+                    CHECK
+                    (
                         symlink(wxString(prefix + "file1").c_str(),
-                        wxString(prefix + "file.lnk").c_str()));
-                    CPPUNIT_ASSERT_EQUAL(0,
+                                wxString(prefix + "file.lnk").c_str()) == 0
+                    );
+
+                    CHECK
+                    (
                         symlink(child.GetFullPath().c_str(),
-                        wxString(prefix + "dir.lnk").c_str()));
+                                wxString(prefix + "dir.lnk").c_str()) == 0
+                    );
                 }
 #endif // __UNIX__
             }
@@ -799,37 +674,35 @@ void FileSystemWatcherTestCase::TestTrees()
 
         void RmDir(wxFileName dir)
         {
-            CPPUNIT_ASSERT(dir.DirExists());
+            REQUIRE(dir.DirExists());
 
-            CPPUNIT_ASSERT(dir.Rmdir(wxPATH_RMDIR_RECURSIVE));
+            CHECK(dir.Rmdir(wxPATH_RMDIR_RECURSIVE));
         }
 
         void WatchDir(wxFileName dir)
         {
-            CPPUNIT_ASSERT(m_watcher);
+            REQUIRE(m_watcher);
 
             // Store the initial count; there may already be some watches
             const int initial = m_watcher->GetWatchedPathsCount();
 
             m_watcher->Add(dir);
-            CPPUNIT_ASSERT_EQUAL(initial + 1,
-                                 m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == initial + 1 );
         }
 
         void RemoveSingleWatch(wxFileName dir)
         {
-            CPPUNIT_ASSERT(m_watcher);
+            REQUIRE(m_watcher);
 
             const int initial = m_watcher->GetWatchedPathsCount();
 
             m_watcher->Remove(dir);
-            CPPUNIT_ASSERT_EQUAL(initial - 1,
-                                 m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == initial - 1 );
         }
 
         void WatchTree(const wxFileName& dir)
         {
-            CPPUNIT_ASSERT(m_watcher);
+            REQUIRE(m_watcher);
 
             int treeitems = 1; // the trunk
 #if !defined(__WINDOWS__) && !defined(wxHAVE_FSEVENTS_FILE_NOTIFICATIONS)
@@ -847,17 +720,17 @@ void FileSystemWatcherTestCase::TestTrees()
             m_watcher->AddTree(dir);
             const int plustree = m_watcher->GetWatchedPathsCount();
 
-            CPPUNIT_ASSERT_EQUAL(initial + treeitems, plustree);
+            CHECK( plustree == initial + treeitems );
 
             m_watcher->RemoveTree(dir);
-            CPPUNIT_ASSERT_EQUAL(initial, m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == initial );
 
             // Now test the refcount mechanism by watching items more than once
             wxFileName child(dir);
             child.AppendDir("child");
             m_watcher->AddTree(child);
             // Check some watches were added; we don't care about the number
-            CPPUNIT_ASSERT(initial < m_watcher->GetWatchedPathsCount());
+            CHECK(initial < m_watcher->GetWatchedPathsCount());
             // Now watch the whole tree and check that the count is the same
             // as it was the first time, despite also adding 'child' separately
             // Except that in wxMSW this isn't true: each watch will be a
@@ -867,11 +740,11 @@ void FileSystemWatcherTestCase::TestTrees()
             fudge = 1;
 #endif // __WINDOWS__ || wxHAVE_FSEVENTS_FILE_NOTIFICATIONS
             m_watcher->AddTree(dir);
-            CPPUNIT_ASSERT_EQUAL(plustree + fudge, m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == plustree + fudge );
             m_watcher->RemoveTree(child);
-            CPPUNIT_ASSERT(initial < m_watcher->GetWatchedPathsCount());
+            CHECK(initial < m_watcher->GetWatchedPathsCount());
             m_watcher->RemoveTree(dir);
-            CPPUNIT_ASSERT_EQUAL(initial, m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == initial );
 #if defined(__UNIX__)
             // Finally, test a tree containing internal symlinks
             RmDir(dir);
@@ -881,8 +754,8 @@ void FileSystemWatcherTestCase::TestTrees()
             // (and without the assert, it would infinitely loop)
             wxFileName fn = dir;
             fn.DontFollowLink();
-            CPPUNIT_ASSERT(m_watcher->AddTree(fn));
-            CPPUNIT_ASSERT(m_watcher->RemoveTree(fn));
+            CHECK(m_watcher->AddTree(fn));
+            CHECK(m_watcher->RemoveTree(fn));
 
             // Regrow the tree without symlinks, ready for the next test
             RmDir(dir);
@@ -892,8 +765,8 @@ void FileSystemWatcherTestCase::TestTrees()
 
         void WatchTreeWithFilespec(const wxFileName& dir)
         {
-            CPPUNIT_ASSERT(m_watcher);
-            CPPUNIT_ASSERT(dir.DirExists()); // Was built in WatchTree()
+            REQUIRE(m_watcher);
+            REQUIRE(dir.DirExists()); // Was built in WatchTree()
 
             // Store the initial count; there may already be some watches
             const int initial = m_watcher->GetWatchedPathsCount();
@@ -909,20 +782,19 @@ void FileSystemWatcherTestCase::TestTrees()
 #endif
             m_watcher->AddTree(dir, wxFSW_EVENT_ALL, "*.txt");
 
-            const int plustree = m_watcher->GetWatchedPathsCount();
-            CPPUNIT_ASSERT_EQUAL(initial + treeitems, plustree);
+            CHECK( m_watcher->GetWatchedPathsCount() == initial + treeitems );
 
             // RemoveTree should try to remove only those files that were added
             m_watcher->RemoveTree(dir);
-            CPPUNIT_ASSERT_EQUAL(initial, m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == initial );
         }
 
         void RemoveAllWatches()
         {
-            CPPUNIT_ASSERT(m_watcher);
+            REQUIRE(m_watcher);
 
             m_watcher->RemoveAll();
-            CPPUNIT_ASSERT_EQUAL(0, m_watcher->GetWatchedPathsCount());
+            CHECK( m_watcher->GetWatchedPathsCount() == 0 );
         }
 
         virtual void GenerateEvent() wxOVERRIDE
@@ -930,16 +802,16 @@ void FileSystemWatcherTestCase::TestTrees()
             // We don't use this function for events. Just run the tests
 
             wxFileName watchdir = EventGenerator::GetWatchDir();
-            CPPUNIT_ASSERT(watchdir.DirExists());
+            REQUIRE(watchdir.DirExists());
 
             wxFileName treedir(watchdir);
             treedir.AppendDir("treetrunk");
-            CPPUNIT_ASSERT(!treedir.DirExists());
+            CHECK(!treedir.DirExists());
 
             wxFileName singledir(watchdir);
             singledir.AppendDir("single");
-            CPPUNIT_ASSERT(!singledir.DirExists());
-            CPPUNIT_ASSERT(singledir.Mkdir());
+            CHECK(!singledir.DirExists());
+            CHECK(singledir.Mkdir());
 
             WatchDir(singledir);
             WatchTree(treedir);
@@ -965,7 +837,7 @@ void FileSystemWatcherTestCase::TestTrees()
 
         virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
-            CPPUNIT_FAIL("Shouldn't be called");
+            FAIL("Shouldn't be called");
 
             return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR);
         }
@@ -979,15 +851,7 @@ void FileSystemWatcherTestCase::TestTrees()
 
     TreeTester tester;
 
-// The fs watcher test cases will hang on OS X if we call Run().
-// This is likely due to differences between the event loop
-// between OS X and the other ports.
-#ifdef OSX_EVENT_LOOP_WORKAROUND
-    tester.Init();
-    tester.GenerateEvent();
-#else
     tester.Run();
-#endif
 }
 
 
@@ -1003,7 +867,7 @@ namespace
 // can't be a weak_definition
 //
 // So define this class outside the function instead.
-class NoEventsAfterRemoveEventTester : public EventHandler,
+class NoEventsAfterRemoveEventTester : public FSWTesterBase,
                                        public wxTimer
 {
 public:
@@ -1019,17 +883,17 @@ public:
     virtual void GenerateEvent() wxOVERRIDE
     {
         m_watcher->Remove(EventGenerator::GetWatchDir());
-        CPPUNIT_ASSERT(eg.CreateFile());
+        CHECK(eg.CreateFile());
     }
 
     virtual void CheckResult() wxOVERRIDE
     {
-        CPPUNIT_ASSERT( m_events.empty() );
+        REQUIRE( m_events.empty() );
     }
 
     virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
     {
-        CPPUNIT_FAIL( "Shouldn't be called" );
+        FAIL( "Shouldn't be called" );
 
         return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR);
     }
@@ -1042,7 +906,8 @@ public:
 
 } // anonymous namespace
 
-void FileSystemWatcherTestCase::TestNoEventsAfterRemove()
+TEST_CASE_METHOD(FileSystemWatcherTestCase,
+                 "wxFileSystemWatcher::NoEventsAfterRemove", "[fsw]")
 {
     NoEventsAfterRemoveEventTester tester;
     tester.Run();
diff --git a/tests/graphics/colour.cpp b/tests/graphics/colour.cpp
index fbfa96870a..bde3b17803 100644
--- a/tests/graphics/colour.cpp
+++ b/tests/graphics/colour.cpp
@@ -115,3 +115,10 @@ void ColourTestCase::FromString()
     CPPUNIT_ASSERT( !wxFromString("rgba(1, 2, 3.456, foo)", &col) );
 }
 
+TEST_CASE("wxColour::GetLuminance", "[colour][luminance]")
+{
+    CHECK( wxBLACK->GetLuminance() == Approx(0.0) );
+    CHECK( wxWHITE->GetLuminance() == Approx(1.0) );
+    CHECK( wxRED->GetLuminance() > 0 );
+    CHECK( wxRED->GetLuminance() < 1 );
+}
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 51192463b0..53cc3a0f49 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -210,6 +210,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_slidertest.obj \
 	$(OBJS)\test_gui_spinctrldbltest.obj \
 	$(OBJS)\test_gui_spinctrltest.obj \
+	$(OBJS)\test_gui_styledtextctrltest.obj \
 	$(OBJS)\test_gui_textctrltest.obj \
 	$(OBJS)\test_gui_textentrytest.obj \
 	$(OBJS)\test_gui_togglebuttontest.obj \
@@ -334,6 +335,10 @@ __DLLFLAG_p_7 = -dWXUSINGDLL
 __WXLIB_WEBVIEW_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1"
+__WXLIB_STC_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_AUI_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
@@ -525,7 +530,7 @@ $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
+	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
 |
 !endif
 
@@ -998,6 +1003,9 @@ $(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
 $(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
 
+$(OBJS)\test_gui_styledtextctrltest.obj: .\controls\styledtextctrltest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\styledtextctrltest.cpp
+
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 94d034dd80..9736869d0a 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -205,6 +205,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_slidertest.o \
 	$(OBJS)\test_gui_spinctrldbltest.o \
 	$(OBJS)\test_gui_spinctrltest.o \
+	$(OBJS)\test_gui_styledtextctrltest.o \
 	$(OBJS)\test_gui_textctrltest.o \
 	$(OBJS)\test_gui_textentrytest.o \
 	$(OBJS)\test_gui_togglebuttontest.o \
@@ -337,6 +338,12 @@ __WXLIB_WEBVIEW_p = \
 endif
 endif
 ifeq ($(MONOLITHIC),0)
+ifeq ($(USE_STC),1)
+__WXLIB_STC_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc
+endif
+endif
+ifeq ($(MONOLITHIC),0)
 __WXLIB_AUI_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
 endif
@@ -503,7 +510,7 @@ endif
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
-	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 data: 
@@ -975,6 +982,9 @@ $(OBJS)\test_gui_spinctrldbltest.o: ./controls/spinctrldbltest.cpp
 $(OBJS)\test_gui_spinctrltest.o: ./controls/spinctrltest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_styledtextctrltest.o: ./controls/styledtextctrltest.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_textctrltest.o: ./controls/textctrltest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 95861401c6..3b1462545b 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -216,6 +216,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_slidertest.obj \
 	$(OBJS)\test_gui_spinctrldbltest.obj \
 	$(OBJS)\test_gui_spinctrltest.obj \
+	$(OBJS)\test_gui_styledtextctrltest.obj \
 	$(OBJS)\test_gui_textctrltest.obj \
 	$(OBJS)\test_gui_textentrytest.obj \
 	$(OBJS)\test_gui_togglebuttontest.obj \
@@ -486,6 +487,10 @@ __DLLFLAG_p_7 = /d WXUSINGDLL
 __WXLIB_WEBVIEW_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib
 !endif
+!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1"
+__WXLIB_STC_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_AUI_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
@@ -716,7 +721,7 @@ $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
+	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_STC_p) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
 <<
 !endif
 
@@ -1189,6 +1194,9 @@ $(OBJS)\test_gui_spinctrldbltest.obj: .\controls\spinctrldbltest.cpp
 $(OBJS)\test_gui_spinctrltest.obj: .\controls\spinctrltest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\spinctrltest.cpp
 
+$(OBJS)\test_gui_styledtextctrltest.obj: .\controls\styledtextctrltest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\styledtextctrltest.cpp
+
 $(OBJS)\test_gui_textctrltest.obj: .\controls\textctrltest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\textctrltest.cpp
 
diff --git a/tests/sizers/boxsizer.cpp b/tests/sizers/boxsizer.cpp
index 2033e1f344..f7df2d95c8 100644
--- a/tests/sizers/boxsizer.cpp
+++ b/tests/sizers/boxsizer.cpp
@@ -25,76 +25,35 @@
 #include "asserthelper.h"
 
 // ----------------------------------------------------------------------------
-// test class
+// test fixture
 // ----------------------------------------------------------------------------
 
-class BoxSizerTestCase : public CppUnit::TestCase
+class BoxSizerTestCase
 {
 public:
-    BoxSizerTestCase() { }
+    BoxSizerTestCase()
+        : m_win(new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY)),
+          m_sizer(new wxBoxSizer(wxHORIZONTAL))
+    {
+        m_win->SetClientSize(127, 35);
+        m_win->SetSizer(m_sizer);
+    }
 
-    virtual void setUp() wxOVERRIDE;
-    virtual void tearDown() wxOVERRIDE;
+    ~BoxSizerTestCase()
+    {
+        delete m_win;
+    }
 
-private:
-    CPPUNIT_TEST_SUITE( BoxSizerTestCase );
-        CPPUNIT_TEST( Size1 );
-        CPPUNIT_TEST( Size3 );
-        CPPUNIT_TEST( CalcMin );
-        CPPUNIT_TEST( SetMinSize );
-        CPPUNIT_TEST( BestSizeRespectsMaxSize );
-        CPPUNIT_TEST( RecalcSizesRespectsMaxSize1 );
-        CPPUNIT_TEST( RecalcSizesRespectsMaxSize2 );
-        CPPUNIT_TEST( IncompatibleFlags );
-    CPPUNIT_TEST_SUITE_END();
-
-    void Size1();
-    void Size3();
-    void CalcMin();
-    void SetMinSize();
-    void BestSizeRespectsMaxSize();
-    void RecalcSizesRespectsMaxSize1();
-    void RecalcSizesRespectsMaxSize2();
-    void IncompatibleFlags();
-
-    wxWindow *m_win;
-    wxSizer *m_sizer;
-
-    wxDECLARE_NO_COPY_CLASS(BoxSizerTestCase);
+protected:
+    wxWindow* const m_win;
+    wxSizer* const m_sizer;
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( BoxSizerTestCase );
-
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BoxSizerTestCase, "BoxSizerTestCase" );
-
-// ----------------------------------------------------------------------------
-// test initialization
-// ----------------------------------------------------------------------------
-
-void BoxSizerTestCase::setUp()
-{
-    m_win = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
-    m_win->SetClientSize(127, 35);
-
-    m_sizer = new wxBoxSizer(wxHORIZONTAL);
-    m_win->SetSizer(m_sizer);
-}
-
-void BoxSizerTestCase::tearDown()
-{
-    delete m_win;
-    m_win = NULL;
-
-    m_sizer = NULL;
-}
-
 // ----------------------------------------------------------------------------
 // tests themselves
 // ----------------------------------------------------------------------------
 
-void BoxSizerTestCase::Size1()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::Size1", "[sizer]")
 {
     const wxSize sizeTotal = m_win->GetClientSize();
     const wxSize sizeChild = sizeTotal / 2;
@@ -103,32 +62,32 @@ void BoxSizerTestCase::Size1()
         child = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild);
     m_sizer->Add(child);
     m_win->Layout();
-    CPPUNIT_ASSERT_EQUAL( sizeChild, child->GetSize() );
+    CHECK(child->GetSize() == sizeChild);
 
     m_sizer->Clear();
     m_sizer->Add(child, wxSizerFlags(1));
     m_win->Layout();
-    CPPUNIT_ASSERT_EQUAL( wxSize(sizeTotal.x, sizeChild.y), child->GetSize() );
+    CHECK( child->GetSize() == wxSize(sizeTotal.x, sizeChild.y) );
 
     m_sizer->Clear();
     m_sizer->Add(child, wxSizerFlags(1).Expand());
     m_win->Layout();
-    CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() );
+    CHECK(child->GetSize() == sizeTotal);
 
     m_sizer->Clear();
     m_sizer->Add(child, wxSizerFlags());
     m_sizer->SetItemMinSize(child, sizeTotal*2);
     m_win->Layout();
-    CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() );
+    CHECK(child->GetSize() == sizeTotal);
 
     m_sizer->Clear();
     m_sizer->Add(child, wxSizerFlags().Expand());
     m_sizer->SetItemMinSize(child, sizeTotal*2);
     m_win->Layout();
-    CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() );
+    CHECK(child->GetSize() == sizeTotal);
 }
 
-void BoxSizerTestCase::Size3()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::Size3", "[sizer]")
 {
     wxGCC_WARNING_SUPPRESS(missing-field-initializers)
 
@@ -262,7 +221,7 @@ void BoxSizerTestCase::Size3()
     }
 }
 
-void BoxSizerTestCase::CalcMin()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::CalcMin", "[sizer]")
 {
     static const unsigned NUM_TEST_ITEM = 3;
 
@@ -313,7 +272,7 @@ void BoxSizerTestCase::CalcMin()
     }
 }
 
-void BoxSizerTestCase::SetMinSize()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::SetMinSize", "[sizer]")
 {
     wxWindow* const child = new wxWindow(m_win, wxID_ANY);
     child->SetInitialSize(wxSize(10, -1));
@@ -322,13 +281,13 @@ void BoxSizerTestCase::SetMinSize()
     // Setting minimal size explicitly must make GetMinSize() return at least
     // this size even if it needs a much smaller one.
     m_sizer->SetMinSize(100, 0);
-    CPPUNIT_ASSERT_EQUAL( 100, m_sizer->GetMinSize().x );
+    CHECK(m_sizer->GetMinSize().x == 100);
 
     m_sizer->Layout();
-    CPPUNIT_ASSERT_EQUAL( 100, m_sizer->GetMinSize().x );
+    CHECK(m_sizer->GetMinSize().x == 100);
 }
 
-void BoxSizerTestCase::BestSizeRespectsMaxSize()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::BestSizeRespectsMaxSize", "[sizer]")
 {
     m_sizer->Clear();
 
@@ -343,10 +302,10 @@ void BoxSizerTestCase::BestSizeRespectsMaxSize()
     m_sizer->Add(sizer);
     m_win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL(maxWidth, listbox->GetSize().GetWidth());
+    CHECK(listbox->GetSize().GetWidth() == maxWidth);
 }
 
-void BoxSizerTestCase::RecalcSizesRespectsMaxSize1()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize1", "[sizer]")
 {
     m_sizer->Clear();
 
@@ -371,10 +330,10 @@ void BoxSizerTestCase::RecalcSizesRespectsMaxSize1()
 
     m_win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL(maxWidth, listbox2->GetSize().GetWidth());
+    CHECK(listbox2->GetSize().GetWidth() == maxWidth);
 }
 
-void BoxSizerTestCase::RecalcSizesRespectsMaxSize2()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::RecalcSizesRespectsMaxSize2", "[sizer]")
 {
     m_sizer->Clear();
 
@@ -395,17 +354,18 @@ void BoxSizerTestCase::RecalcSizesRespectsMaxSize2()
 
     m_win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL(125, child1->GetSize().GetHeight());
-    CPPUNIT_ASSERT_EQUAL(50, child2->GetSize().GetHeight());
-    CPPUNIT_ASSERT_EQUAL(125, child3->GetSize().GetHeight());
+    CHECK(child1->GetSize().GetHeight() == 125);
+    CHECK(child2->GetSize().GetHeight() == 50);
+    CHECK(child3->GetSize().GetHeight() == 125);
 }
 
-void BoxSizerTestCase::IncompatibleFlags()
+TEST_CASE_METHOD(BoxSizerTestCase, "BoxSizer::IncompatibleFlags", "[sizer]")
 {
+    // This unhygienic macro relies on having a local variable called "sizer".
 #define ASSERT_SIZER_INVALID_FLAGS(f, msg) \
     WX_ASSERT_FAILS_WITH_ASSERT_MESSAGE( \
             "Expected assertion not generated for " msg, \
-            m_sizer->Add(10, 10, 0, f) \
+            sizer->Add(10, 10, 0, f) \
         )
 
 #define ASSERT_SIZER_INCOMPATIBLE_FLAGS(f1, f2) \
@@ -413,6 +373,9 @@ void BoxSizerTestCase::IncompatibleFlags()
         "using incompatible flags " #f1 " and " #f2 \
     )
 
+    // First check with the horizontal sizer, which is what we use by default.
+    wxSizer* sizer = m_sizer;
+
     // In horizontal sizers alignment is only used in vertical direction.
     ASSERT_SIZER_INVALID_FLAGS(
         wxALIGN_RIGHT,
@@ -426,7 +389,7 @@ void BoxSizerTestCase::IncompatibleFlags()
 
     // However using wxALIGN_CENTRE_HORIZONTAL together with
     // wxALIGN_CENTRE_VERTICAL as done by wxSizerFlags::Centre() should work.
-    m_sizer->Add(10, 10, wxSizerFlags().Centre());
+    sizer->Add(10, 10, wxSizerFlags().Centre());
 
     // Combining two vertical alignment flags doesn't make sense.
     ASSERT_SIZER_INCOMPATIBLE_FLAGS(wxALIGN_BOTTOM, wxALIGN_CENTRE_VERTICAL);
@@ -435,10 +398,19 @@ void BoxSizerTestCase::IncompatibleFlags()
     ASSERT_SIZER_INCOMPATIBLE_FLAGS(wxEXPAND, wxALIGN_CENTRE_VERTICAL);
     ASSERT_SIZER_INCOMPATIBLE_FLAGS(wxEXPAND, wxALIGN_BOTTOM);
 
+    // But combining it with these flags and wxSHAPED does make sense and so
+    // shouldn't result in an assert.
+    CHECK_NOTHROW(
+        sizer->Add(10, 10, 0, wxEXPAND | wxSHAPED | wxALIGN_CENTRE_VERTICAL)
+    );
+    CHECK_NOTHROW(
+        sizer->Add(10, 10, 0, wxEXPAND | wxSHAPED | wxALIGN_TOP)
+    );
+
 
     // And now exactly the same thing in the other direction.
-    m_sizer = new wxBoxSizer(wxVERTICAL);
-    m_win->SetSizer(m_sizer);
+    sizer = new wxBoxSizer(wxVERTICAL);
+    m_win->SetSizer(sizer);
 
     ASSERT_SIZER_INVALID_FLAGS(
         wxALIGN_BOTTOM,
@@ -450,12 +422,19 @@ void BoxSizerTestCase::IncompatibleFlags()
         "using wxALIGN_CENTRE_VERTICAL in a vertical sizer"
     );
 
-    m_sizer->Add(10, 10, wxSizerFlags().Centre());
+    sizer->Add(10, 10, wxSizerFlags().Centre());
 
     ASSERT_SIZER_INCOMPATIBLE_FLAGS(wxALIGN_RIGHT, wxALIGN_CENTRE_HORIZONTAL);
     ASSERT_SIZER_INCOMPATIBLE_FLAGS(wxEXPAND, wxALIGN_CENTRE_HORIZONTAL);
     ASSERT_SIZER_INCOMPATIBLE_FLAGS(wxEXPAND, wxALIGN_RIGHT);
 
+    CHECK_NOTHROW(
+        sizer->Add(10, 10, 0, wxEXPAND | wxSHAPED | wxALIGN_CENTRE_HORIZONTAL)
+    );
+    CHECK_NOTHROW(
+        sizer->Add(10, 10, 0, wxEXPAND | wxSHAPED | wxALIGN_RIGHT)
+    );
+
 #undef ASSERT_SIZER_INCOMPATIBLE_FLAGS
 #undef ASSERT_SIZER_INVALID_FLAGS
 }
diff --git a/tests/sizers/wrapsizer.cpp b/tests/sizers/wrapsizer.cpp
index d574b24962..28278a19e4 100644
--- a/tests/sizers/wrapsizer.cpp
+++ b/tests/sizers/wrapsizer.cpp
@@ -24,104 +24,92 @@
 
 #include "asserthelper.h"
 
-// ----------------------------------------------------------------------------
-// test class
-// ----------------------------------------------------------------------------
-
-class WrapSizerTestCase : public CppUnit::TestCase
+TEST_CASE("wxWrapSizer::CalcMin", "[wxWrapSizer]")
 {
-public:
-    WrapSizerTestCase() { }
+    wxScopedPtr<wxWindow> win(new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY));
+    win->SetClientSize(180, 240);
 
-    virtual void setUp() wxOVERRIDE;
-    virtual void tearDown() wxOVERRIDE;
+    wxSizer *sizer = new wxWrapSizer(wxHORIZONTAL);
+    win->SetSizer(sizer);
 
-private:
-    CPPUNIT_TEST_SUITE( WrapSizerTestCase );
-        CPPUNIT_TEST( CalcMin );
-    CPPUNIT_TEST_SUITE_END();
-
-    void CalcMin();
-
-    wxWindow *m_win;
-    wxSizer *m_sizer;
-
-    wxDECLARE_NO_COPY_CLASS(WrapSizerTestCase);
-};
-
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( WrapSizerTestCase );
-
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( WrapSizerTestCase, "WrapSizerTestCase" );
-
-// ----------------------------------------------------------------------------
-// test initialization
-// ----------------------------------------------------------------------------
-
-void WrapSizerTestCase::setUp()
-{
-    m_win = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
-    m_win->SetClientSize(180, 240);
-
-    m_sizer = new wxWrapSizer(wxHORIZONTAL);
-    m_win->SetSizer(m_sizer);
-}
-
-void WrapSizerTestCase::tearDown()
-{
-    delete m_win;
-    m_win = NULL;
-
-    m_sizer = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// tests themselves
-// ----------------------------------------------------------------------------
-
-void WrapSizerTestCase::CalcMin()
-{
-    const wxSize sizeTotal = m_win->GetClientSize();
     wxSize sizeMinExpected;
 
     // With a single child the min size must be the same as child size.
-    const wxSize sizeChild1 = wxSize(sizeTotal.x/2 - 10, sizeTotal.y/4);
+    const wxSize sizeChild1 = wxSize(80, 60);
     sizeMinExpected = sizeChild1;
 
     wxWindow * const
-        child1 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild1);
+        child1 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild1);
     child1->SetBackgroundColour(*wxRED);
-    m_sizer->Add(child1);
-    m_win->Layout();
+    sizer->Add(child1);
+    win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+    CHECK( sizeMinExpected == sizer->CalcMin() );
 
     // If both children can fit in the same row, the minimal size of the sizer
     // is determined by the sum of their minimal horizontal dimensions and
     // the maximum of their minimal vertical dimensions.
-    const wxSize sizeChild2 = wxSize(sizeTotal.x/2 + 10, sizeTotal.y/3);
+    const wxSize sizeChild2 = wxSize(100, 80);
     sizeMinExpected.x += sizeChild2.x;
     sizeMinExpected.y = wxMax(sizeChild1.y, sizeChild2.y);
 
     wxWindow * const
-        child2 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild2);
+        child2 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild2);
     child2->SetBackgroundColour(*wxYELLOW);
-    m_sizer->Add(child2);
-    m_win->Layout();
+    sizer->Add(child2);
+    win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+    CHECK( sizeMinExpected == sizer->CalcMin() );
 
     // Three children will take at least two rows so the minimal size in
     // vertical direction must increase.
-    const wxSize sizeChild3 = wxSize(sizeTotal.x/2, sizeTotal.y/5);
+    const wxSize sizeChild3 = wxSize(90, 40);
     sizeMinExpected.y += sizeChild3.y;
 
     wxWindow * const
-        child3 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild3);
+        child3 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild3);
     child3->SetBackgroundColour(*wxGREEN);
-    m_sizer->Add(child3);
-    m_win->Layout();
+    sizer->Add(child3);
+    win->Layout();
 
-    CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+    CHECK( sizeMinExpected == sizer->CalcMin() );
+}
+
+TEST_CASE("wxWrapSizer::CalcMinFromMinor", "[wxWrapSizer]")
+{
+    wxScopedPtr<wxWindow> win(new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY));
+    win->SetClientSize(180, 240);
+
+    wxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL);
+    win->SetSizer(boxSizer);
+
+    // To test CalcMinFromMinor function the wrap sizer with the
+    // horizonral align added to the box sizer with horizontal align.
+    wxSizer* wrapSizer = new wxWrapSizer(wxHORIZONTAL);
+    boxSizer->Add(wrapSizer);
+
+    // Add three child windows. Sum of the first and the second windows widths should
+    // be less than the width of the third window.
+    const wxSize sizeChild1 = wxSize(40, 60);
+    wxWindow * const
+        child1 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild1);
+    child1->SetBackgroundColour(*wxRED);
+    wrapSizer->Add(child1);
+
+    const wxSize sizeChild2 = wxSize(50, 80);
+    wxWindow * const
+        child2 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild2);
+    child2->SetBackgroundColour(*wxGREEN);
+    wrapSizer->Add(child2);
+
+    const wxSize sizeChild3 = wxSize(100, 120);
+    wxWindow * const
+        child3 = new wxWindow(win.get(), wxID_ANY, wxDefaultPosition, sizeChild3);
+    child3->SetBackgroundColour(*wxBLUE);
+    wrapSizer->Add(child3);
+
+    // First two windows should be in a first row and the third in a second row.
+    const wxSize sizeMinExpected = wxSize(sizeChild3.x, sizeChild2.y + sizeChild3.y);
+    win->Layout();
+    CHECK(sizeMinExpected == wrapSizer->CalcMin());
 }
diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index e9682b5761..71cafa3632 100644
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -626,13 +626,7 @@ void StdStringTestCase::StdConversion()
 
 void StdStringTestCase::StdAlgo()
 {
-    // Unfortunately this currently doesn't work with libc++ in C++11 mode, see
-    // comment near iter_swap() definition in wx/string.h.
-#if __cplusplus < 201103L || !defined(_LIBCPP_VERSION)
     wxString s("AB");
     std::reverse(s.begin(), s.end());
     CPPUNIT_ASSERT_EQUAL( "BA", s );
-#else
-    wxLogWarning("Skipping std::reverse() test broken with C++11/libc++");
-#endif
 }
diff --git a/tests/test.bkl b/tests/test.bkl
index 1f389fa3bf..70326b8dce 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -223,6 +223,7 @@
             controls/slidertest.cpp
             controls/spinctrldbltest.cpp
             controls/spinctrltest.cpp
+            controls/styledtextctrltest.cpp
             controls/textctrltest.cpp
             controls/textentrytest.cpp
             controls/togglebuttontest.cpp
@@ -282,9 +283,10 @@
             Can't use <wx-lib> here as it doesn't work with conditionally
             defined variables, so fall back <sys-lib> as we must not link with
             inexisting webview library to be able to run tests even if
-            wxWebView is not available.
+            wxWebView or wxSTC is not available.
          -->
         <sys-lib>$(WXLIB_WEBVIEW)</sys-lib>
+        <sys-lib>$(WXLIB_STC)</sys-lib>
         <wx-lib>aui</wx-lib>
         <wx-lib>richtext</wx-lib>
         <wx-lib>media</wx-lib>
diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj
index dd60da1d58..01d985c991 100644
--- a/tests/test_gui.vcxproj
+++ b/tests/test_gui.vcxproj
@@ -154,7 +154,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_stc.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -193,7 +193,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_stc.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -236,7 +236,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_stc.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -275,7 +275,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_stc.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -318,7 +318,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_stc.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -357,7 +357,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_stc.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -400,7 +400,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)ud_webview.lib;wxmsw$(wxShortVersionString)ud_richtext.lib;wxmsw$(wxShortVersionString)ud_stc.lib;wxmsw$(wxShortVersionString)ud_aui.lib;wxmsw$(wxShortVersionString)ud_media.lib;wxmsw$(wxShortVersionString)ud_xrc.lib;wxbase$(wxShortVersionString)ud_xml.lib;wxmsw$(wxShortVersionString)ud_html.lib;wxmsw$(wxShortVersionString)ud_core.lib;wxbase$(wxShortVersionString)ud_net.lib;wxbase$(wxShortVersionString)ud.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -439,7 +439,7 @@
       <AdditionalIncludeDirectories>..\lib\$(wxOutDirName)\$(wxIncSubDir);.\..\include;..\3rdparty\catch\include;.;.\..\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw$(wxShortVersionString)u_webview.lib;wxmsw$(wxShortVersionString)u_richtext.lib;wxmsw$(wxShortVersionString)u_stc.lib;wxmsw$(wxShortVersionString)u_aui.lib;wxmsw$(wxShortVersionString)u_media.lib;wxmsw$(wxShortVersionString)u_xrc.lib;wxbase$(wxShortVersionString)u_xml.lib;wxmsw$(wxShortVersionString)u_html.lib;wxmsw$(wxShortVersionString)u_core.lib;wxbase$(wxShortVersionString)u_net.lib;wxbase$(wxShortVersionString)u.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -496,6 +496,7 @@
     <ClCompile Include="controls\slidertest.cpp" />
     <ClCompile Include="controls\spinctrldbltest.cpp" />
     <ClCompile Include="controls\spinctrltest.cpp" />
+    <ClCompile Include="controls\styledtextctrltest.cpp" />
     <ClCompile Include="controls\textctrltest.cpp" />
     <ClCompile Include="controls\textentrytest.cpp" />
     <ClCompile Include="controls\togglebuttontest.cpp" />
diff --git a/tests/test_gui.vcxproj.filters b/tests/test_gui.vcxproj.filters
index 38c0bd0806..e61c1bf4fd 100644
--- a/tests/test_gui.vcxproj.filters
+++ b/tests/test_gui.vcxproj.filters
@@ -239,6 +239,9 @@
     <ClCompile Include="controls\spinctrltest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="controls\styledtextctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 5854a3b1a2..83ccfa7655 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -49,7 +49,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -184,7 +184,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -249,7 +249,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -562,6 +562,9 @@
 			<File
 				RelativePath=".\controls\spinctrltest.cpp">
 			</File>
+			<File
+				RelativePath=".\controls\styledtextctrltest.cpp">
+			</File>
 			<File
 				RelativePath=".\test.cpp">
 			</File>
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 6c61aa1c74..5dba30d921 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -285,7 +285,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -382,7 +382,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -484,7 +484,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud_x64\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -581,7 +581,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu_x64\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -683,7 +683,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll_x64\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -780,7 +780,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll_x64\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -1218,6 +1218,10 @@
 				RelativePath=".\controls\spinctrltest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\controls\styledtextctrltest.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\test.cpp"
 				>
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 85e5038f99..fe4f382385 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -85,7 +85,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -277,7 +277,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -371,7 +371,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -469,7 +469,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud_x64\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -563,7 +563,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu_x64\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -661,7 +661,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_webview.lib wxmsw31ud_stc.lib wxmsw31ud_aui.lib  wxmsw31ud_richtext.lib  wxmsw31ud_media.lib  wxmsw31ud_xrc.lib  wxbase31ud_xml.lib  wxmsw31ud_html.lib  wxmsw31ud_core.lib  wxbase31ud_net.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll_x64\test_gui.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -755,7 +755,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_webview.lib wxmsw31u_stc.lib wxmsw31u_aui.lib  wxmsw31u_richtext.lib  wxmsw31u_media.lib  wxmsw31u_xrc.lib  wxbase31u_xml.lib  wxmsw31u_html.lib  wxmsw31u_core.lib  wxbase31u_net.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll_x64\test_gui.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -1190,6 +1190,10 @@
 				RelativePath=".\controls\spinctrltest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\controls\styledtextctrltest.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\test.cpp"
 				>