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

Move duplicated code to the shared function.

Browse Source 
Code to calculate label width in wxPropertyCategory::GetTextExtent and CalculateTextExtent is duplicated.
This commit is contained in:
Artur Wieczorek
2016-03-06 21:21:19 +01:00
parent 8b44873690
commit ff788f05bb
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/propgrid/property.cpp
View File

@@ -2930,20 +2930,23 @@ wxString wxPropertyCategory::GetValueAsString( int argFlags ) const
return wxPGProperty::GetValueAsString(argFlags); return wxPGProperty::GetValueAsString(argFlags);
} }
static int DoGetTextExtent(const wxWindow* wnd, const wxString& label, const wxFont& font)
{
int x = 0, y = 0;
wnd->GetTextExtent(label, &x, &y, 0, 0, &font);
return x;
}
int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font ) const int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font ) const
{ {
if ( m_textExtent > 0 ) if ( m_textExtent > 0 )
return m_textExtent; return m_textExtent;
int x = 0, y = 0; return DoGetTextExtent(wnd, m_label, font);
((wxWindow*)wnd)->GetTextExtent( m_label, &x, &y, 0, 0, &font );
return x;
} }
void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font ) void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font )
{ {
int x = 0, y = 0; m_textExtent = DoGetTextExtent(wnd, m_label, font);
wnd->GetTextExtent( m_label, &x, &y, 0, 0, &font );
m_textExtent = x;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------