don't invalidate the font in SetNativeFontInfo[Desc]() to conform to the documented...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 3973da57d99e6aaadf7e942f6c9293baa68512c6..866799d67df2040f3c8b35317d9b40919db4cedd 100644 (file)
--- 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 236f10b00d9efccb9cefccf9ec5cc5fffb039ef2..4fcd211e5350148f8f2434b45e3ad8edab2c40ca 100644 (file)
--- 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;
 }