From e78209f6a83aa446ba4ae6947029f6f90d2ef61e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 30 Apr 2013 11:13:21 +0000 Subject: [PATCH] Fix wxFont test compilation after wxFont(int flags) ctor removal. Also mention this incompatible (since 2.9.4) change in the change log. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 4 ++++ tests/font/fonttest.cpp | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index f3371da273..f070c13662 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -547,6 +547,10 @@ INCOMPATIBLE CHANGES SINCE 2.9.4: rather than a wxWebViewBackend enum value. - wxWebView identifiers of the form WEB_VIEW_* have been renamed to WEBVIEW_* for consistency with the rest of wxWidgets. +- wxFont(int size, wxFontFamily family, int flags) ctor added in 2.9.4 was + removed to avoid ambiguities with the other existing ctors and replaced with + the new wxFont(wxFontInfo) ctor. + All: diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp index de529f62b2..bf19403207 100644 --- a/tests/font/fonttest.cpp +++ b/tests/font/fonttest.cpp @@ -103,9 +103,6 @@ void FontTestCase::Construct() // compile because it's easy to introduce ambiguities due to the number of // overloaded wxFont ctors. - CPPUNIT_ASSERT( wxFont(10, wxFONTFAMILY_DEFAULT).IsOk() ); - CPPUNIT_ASSERT( wxFont(10, wxFONTFAMILY_DEFAULT, - wxFONTFLAG_DEFAULT).IsOk() ); CPPUNIT_ASSERT( wxFont(10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL).IsOk() );