Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxFont test compilation after wxFont(int flags) ctor removal.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-04-30 11:13:21 +00:00
parent f48e687370
commit e78209f6a8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -547,6 +547,10 @@ INCOMPATIBLE CHANGES SINCE 2.9.4:
rather than a wxWebViewBackend enum value. rather than a wxWebViewBackend enum value.
- wxWebView identifiers of the form WEB_VIEW_* have been renamed to WEBVIEW_* - wxWebView identifiers of the form WEB_VIEW_* have been renamed to WEBVIEW_*
for consistency with the rest of wxWidgets. 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: All:

3
tests/font/fonttest.cpp
View File

@@ -103,9 +103,6 @@ void FontTestCase::Construct()
// compile because it's easy to introduce ambiguities due to the number of // compile because it's easy to introduce ambiguities due to the number of
// overloaded wxFont ctors. // 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, CPPUNIT_ASSERT( wxFont(10, wxFONTFAMILY_DEFAULT,
wxFONTSTYLE_NORMAL, wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL).IsOk() ); wxFONTWEIGHT_NORMAL).IsOk() );