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

Allow constructing wxGTK wxTextMeasure with NULL font.

Browse Source 
The font is explicitly documented as being possibly NULL in the base class and
wxMSW handles NULL font just fine, so also handle it in the GTK version.

See #14706.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-01 17:15:15 +00:00
parent 18764039ab
commit e0da9e871a
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/textmeasure.cpp
View File

@@ -40,8 +40,6 @@
void wxTextMeasure::Init()
{
wxASSERT_MSG( m_font, wxT("wxTextMeasure needs a valid wxFont") );
m_context = NULL;
m_layout = NULL;
@@ -87,7 +85,7 @@ void wxTextMeasure::BeginMeasuring()
if ( m_layout )
{
pango_layout_set_font_description(m_layout,
m_font->GetNativeFontInfo()->description);
GetFont().GetNativeFontInfo()->description);
}
}
@@ -124,7 +122,7 @@ void wxTextMeasure::DoGetTextExtent(const wxString& string,
}
// Set layout's text
const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, *m_font);
const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, GetFont());
if ( !dataUTF8 )
{
// hardly ideal, but what else can we do if conversion failed?
@@ -167,7 +165,7 @@ bool wxTextMeasure::DoGetPartialTextExtents(const wxString& text,
double WXUNUSED(scaleX))
{
// Set layout's text
const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(text, *m_font);
const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(text, GetFont());
if ( !dataUTF8 )
{
// hardly ideal, but what else can we do if conversion failed?