Remove assert from wxNativeFontInfo::GetFamily() due to, in case of some gtk+ setup...

nonexistent facenames family through wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) on startup.
Document wxFont work in changes.txt

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 1223307636ec8cecf346201e1c0417a3c5d23f7d..1b3212f7cd88c3866dc34d108862b874edc3826f 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -53,9 +53,10 @@ wxGTK:
 - Implemented wxTopLevelWindow::RequestUserAttention() (Mart Raudsepp).
 - Base library is now binary compatible when built with wxGTK and wxMotif.
 - wxTextCtrl::XYToPosition, PositionToXY and GetLineLength calls are now
-  instantaneous in case of GTK+2 multi-line controls (Mart Raudsepp).
+  instantaneous in case of GTK 2.x multi-line controls (Mart Raudsepp).
 - Added support for left, centre and right text alignment attributes under
   GTK+2 multi-line text controls (Mart Raudsepp).
+- Various wxFont improvements for GTK 2.x builds (Mart Raudsepp).
 
 wxMac:
 
@@ -84,9 +85,14 @@ wxMotif:
   be created with a "sensible" initial width.
 
 wxMGL:
+
 - Fixed crash on exit.
 - Fixed drawing problems when windows are resized.
 
+wxX11:
+
+- Various wxFont improvements for unicode builds (Mart Raudsepp).
+
 
 2.6.1
 -----

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 7b1801857e34c3e844e8a6e9ed31497842f634d4..84d09f9931dd80845ff6d33e0ab589ec785796ee 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -173,7 +173,9 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
 
         g_free(families);
 
-        wxASSERT_MSG( family, wxT("wxNativeFontInfo::GetFamily() - No appropriate PangoFontFamily found for ::description") );
+        // Some gtk+ systems might query for a non-existing font from wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)
+        // on initialization, don't assert until wxSystemSettings::GetFont is checked for this - MR
+        // wxASSERT_MSG( family, wxT("wxNativeFontInfo::GetFamily() - No appropriate PangoFontFamily found for ::description") );
 
         //BCI: Cache the wxFontFamily inside the class. Validate cache with
         //BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0