<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/40745aba497c4c5c4dedf1d3a8ea9d5012a9d4f0">https://github.com/macports/macports-ports/commit/40745aba497c4c5c4dedf1d3a8ea9d5012a9d4f0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 40745ab wxWidgets-3.2: upgrade to commit 159186d from git
</span>40745ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40745aba497c4c5c4dedf1d3a8ea9d5012a9d4f0
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Dec 12 11:50:51 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> wxWidgets-3.2: upgrade to commit 159186d from git
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Use commit 159186d (2016-12-12) from master
</span><span style='display:block; white-space:pre;color:#404040;'> to add support for newer platforms without extensive patching.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove two patches from upstream.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52951
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/wxWidgets/wxWidgets/pull/370
</span>---
graphics/wxWidgets-3.2/Portfile | 18 +++--
graphics/wxWidgets-3.2/files/patch-configure.diff | 2 +-
.../files/patch-include-wx-defs.h.diff | 63 -----------------
graphics/wxWidgets-3.2/files/patch-upstream.diff | 78 ----------------------
4 files changed, 12 insertions(+), 149 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/Portfile b/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bd6a22..fee3e49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup github 1.0
PortGroup select 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wxWidgets wxWidgets 3.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Instead of backports a huge number of patches to support the newer macOS versions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# simply fetch a newer version from git (master) until 3.1.1 comes out.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is a development port anyway and generally not used as dependency.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#github.setup wxWidgets wxWidgets 3.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wxWidgets wxWidgets 159186d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.0-git-20161212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version v3.1.0
</span> name wxWidgets-3.2
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +31,8 @@ long_description wxWidgets ${branch} is an open-source cross-platform C++ \
</span>
homepage http://www.wxwidgets.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 843b4b0b7d18b2a6ff7c7dd1c68ebd425e7318ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c2ad6b8f36be70b609f53dc29fdd8899f19c9ad4e963386cedc4a3396bb3e130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 51cd65d4823555757e3f67153a480e5705195f45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0cb93a8a9bc2d343bd71115a750c9bdc480b344c7ab338b88144aa38af3ccc13
</span>
dist_subdir wxWidgets/${version}
worksrcdir ${distname}/build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,9 +52,7 @@ depends_lib-append port:jpeg \
</span> depends_run port:wxWidgets-common \
port:wxWidgets_select
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-include-wx-defs.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-upstream.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.diff
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/files/patch-configure.diff b/graphics/wxWidgets-3.2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 281bf5c..2a60aa7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.2/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> This patch is needed for GTK to make sure that the port finds the right OpenGL library
--- configure.orig
+++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20792,48 +20792,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19465,48 +19465,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/files/patch-include-wx-defs.h.diff b/graphics/wxWidgets-3.2/files/patch-include-wx-defs.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e2241cc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/files/patch-include-wx-defs.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/wx/defs.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/wx/defs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -392,36 +392,36 @@ typedef short int WXTYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Since 4.9.2, g++ provides __has_include() but, unlike clang, refuses to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compile the C++11 headers in C++98 mode (and we are sure we use the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- latter because we explicitly checked for C++11 above).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if defined(__GNUC__) && !defined(__clang__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define wx_has_cpp11_include(h) 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define wx_has_cpp11_include(h) __has_include(h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if !defined(HAVE_TYPE_TRAITS) && !defined(HAVE_TR1_TYPE_TRAITS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if wx_has_cpp11_include(<type_traits>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define HAVE_TYPE_TRAITS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif __has_include(<tr1/type_traits>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define HAVE_TR1_TYPE_TRAITS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Note that clang < 3.3 does not support the following syntax:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define foo(h) __has_include(h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #foo(<bar>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if !defined(HAVE_TYPE_TRAITS) && !defined(HAVE_TR1_TYPE_TRAITS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__clang__) && __has_include(<type_traits>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAVE_TYPE_TRAITS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif __has_include(<tr1/type_traits>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAVE_TR1_TYPE_TRAITS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if !defined(HAVE_STD_UNORDERED_MAP) && !defined(HAVE_TR1_UNORDERED_MAP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if wx_has_cpp11_include(<unordered_map>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define HAVE_STD_UNORDERED_MAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif __has_include(<tr1/unordered_map>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define HAVE_TR1_UNORDERED_MAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if !defined(HAVE_STD_UNORDERED_MAP) && !defined(HAVE_TR1_UNORDERED_MAP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__clang__) && __has_include(<unordered_map>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAVE_STD_UNORDERED_MAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif __has_include(<tr1/unordered_map>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAVE_TR1_UNORDERED_MAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if !defined(HAVE_STD_UNORDERED_SET) && !defined(HAVE_TR1_UNORDERED_SET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #if wx_has_cpp11_include(<unordered_set>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define HAVE_STD_UNORDERED_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #elif __has_include(<tr1/unordered_set>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #define HAVE_TR1_UNORDERED_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if !defined(HAVE_STD_UNORDERED_SET) && !defined(HAVE_TR1_UNORDERED_SET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(__clang__) && __has_include(<unordered_set>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAVE_STD_UNORDERED_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif __has_include(<tr1/unordered_set>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define HAVE_TR1_UNORDERED_SET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif /* defined(__GNUC__) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* defined(__has_include) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __cplusplus */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.2/files/patch-upstream.diff b/graphics/wxWidgets-3.2/files/patch-upstream.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ef917b4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.2/files/patch-upstream.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,78 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cee3188c1abaa5b222c57b87cc94064e56921db8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Vadim Zeitlin <vadim wxwidgets.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 29 Feb 2016 18:47:30 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Don't connect handler for wxEVT_TEXT_ENTER in wxComboCtrl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unnecessarily
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Connecting to wxEVT_TEXT_ENTER is not necessary if wxTE_PROCESS_ENTER style is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not used was always useless and is actively harmful since the changes of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-5591a2009394c9bae43bcd2fa08f2fb51391cbc1 as it results in an assert failure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Just don't do it unless we really want, and will get, these events.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ab9431..d451d68 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/combocmn.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/combocmn.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1100,9 +1100,12 @@ wxComboCtrlBase::CreateTextCtrl(int style)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_text->Connect(id, wxEVT_TEXT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NULL, this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_text->Connect(id, wxEVT_TEXT_ENTER,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NULL, this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( style & wxTE_PROCESS_ENTER )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_text->Connect(id, wxEVT_TEXT_ENTER,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL, this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_text->SetHint(m_hintText);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ee486dba32d02c744ae4007940f41a5b24b8c574 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Vadim Zeitlin <vadim wxwidgets.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 29 Feb 2016 18:05:02 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix build error in wxOSX clang C++11 build for i386
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-When building for i386 in C++11 mode clang warns about narrowing conversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-from double to CGFloat (== float) in the initialization.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix it by using explicit suffixes for the float literals.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 091c2c2..2d9cb96 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osx/carbon/graphics.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osx/carbon/graphics.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2276,7 +2276,7 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFloat width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGFloat height = CTFontGetXHeight( font );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGPoint points[] = { {0.0, height * 0.6}, {width, height * 0.6} };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGPoint points[] = { {0.0, height * 0.6f}, {width, height * 0.6f} };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextSetStrokeColorWithColor(m_cgContext, col);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextSetShouldAntialias(m_cgContext, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextSetLineWidth(m_cgContext, 1.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 173ecd77c4280e48541c33bdfe499985852935ba Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Vadim Zeitlin <vadim wxwidgets.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 29 Feb 2016 16:12:53 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix clang -Winconsistent-missing-override in wxTextCtrl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add missing wxOVERRIDE for OnDynamicBind().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cd7a815..3414095 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/wx/textctrl.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/wx/textctrl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -746,7 +746,7 @@ class WXDLLIMPEXP_CORE wxTextCtrlBase : public wxControl,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Override wxEvtHandler method to check for a common problem of binding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // wxEVT_TEXT_ENTER to a control without wxTE_PROCESS_ENTER style, which is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // never going to work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // override streambuf method
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if wxHAS_TEXT_WINDOW_STREAM
</span></pre><pre style='margin:0'>
</pre>