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

Remove assert from wxNativeFontInfo::GetFamily() due to, in case of some gtk+ setup/themes, querying for an

Browse Source 
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
This commit is contained in:
Mart Raudsepp
2005-08-29 21:14:18 +00:00
parent 18c9aebeca
commit 3c542a4de0
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changes.txt
View File

@@ -53,9 +53,10 @@ wxGTK:
- Implemented wxTopLevelWindow::RequestUserAttention() (Mart Raudsepp). - Implemented wxTopLevelWindow::RequestUserAttention() (Mart Raudsepp).
- Base library is now binary compatible when built with wxGTK and wxMotif. - Base library is now binary compatible when built with wxGTK and wxMotif.
- wxTextCtrl::XYToPosition, PositionToXY and GetLineLength calls are now - 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 - Added support for left, centre and right text alignment attributes under
GTK+2 multi-line text controls (Mart Raudsepp). GTK+2 multi-line text controls (Mart Raudsepp).
- Various wxFont improvements for GTK 2.x builds (Mart Raudsepp).
wxMac: wxMac:
@@ -84,9 +85,14 @@ wxMotif:
be created with a "sensible" initial width. be created with a "sensible" initial width.
wxMGL: wxMGL:
- Fixed crash on exit. - Fixed crash on exit.
- Fixed drawing problems when windows are resized. - Fixed drawing problems when windows are resized.
wxX11:
- Various wxFont improvements for unicode builds (Mart Raudsepp).
2.6.1 2.6.1
----- -----

4
src/unix/fontutil.cpp
View File

@@ -173,7 +173,9 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
g_free(families); 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: 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 //BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0