From ab29bb87b20df9b6afb50d13044506e143e84951 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jun 2007 15:55:48 +0000 Subject: [PATCH] don't invalidate the font in SetNativeFontInfo[Desc]() to conform to the documented behaviour (patch 1743548) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 9 ++++----- src/common/fontcmn.cpp | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 3973da57d9..866799d67d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -71,12 +71,9 @@ Changes in behaviour which may result in compilation errors - virtual wxHtmlParser::AddText() takes wxString, not wxChar*, argument now. -- Functions that took wxChar* arguments that could by NULL in wxWidgets 2.8. +- Funtions that took wxChar* arguments that could by NULL in wxWidgets 2.8. are deprecated and passing NULL to them won't compile anymore, wxEmptyString - must be used instead. In some cases new functions can be used too, e.g.: - * use wxLog::DisableTimestamp() instead of wxLog::SetTimestamp(NULL) - * wxUnsetEnv(var) instead of wxSetEnv(var, NULL) - + must be used instead. Deprecated methods and their replacements ----------------------------------------- @@ -180,6 +177,8 @@ All (GUI): - Significantly improved startup times of XRC-based applications using embedded resources on Unix (requires resources recompilation) - Fixed freeing of "static" alpha data in wxImage (Axel Gembe) +- Don't invalidate the font in SetNativeFontInfo[Desc]() if the string is + invalid, to conform to the documented behaviour (Langhammer) wxMSW: diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp index 236f10b00d..4fcd211e53 100644 --- a/src/common/fontcmn.cpp +++ b/src/common/fontcmn.cpp @@ -303,7 +303,6 @@ bool wxFontBase::SetNativeFontInfo(const wxString& info) return true; } - UnRef(); return false; } @@ -316,7 +315,6 @@ bool wxFontBase::SetNativeFontInfoUserDesc(const wxString& info) return true; } - UnRef(); return false; } -- 2.45.2