From 3c542a4de0862ab3e46f4a3c76797ae94ab9de60 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Mon, 29 Aug 2005 21:14:18 +0000 Subject: [PATCH] Remove assert from wxNativeFontInfo::GetFamily() due to, in case of some gtk+ setup/themes, querying for an 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 --- docs/changes.txt | 8 +++++++- src/unix/fontutil.cpp | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 1223307636..1b3212f7cd 100644 --- 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 7b1801857e..84d09f9931 100644 --- 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 -- 2.45.2