Allow width to be absent but precision present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2dec67617f
commit
fe4cb4f5ea
@ -1159,20 +1159,25 @@ void wxGridCellFloatEditor::SetParameters(const wxString& params)
|
||||
wxString wxGridCellFloatEditor::GetString() const
|
||||
{
|
||||
wxString fmt;
|
||||
if ( m_width == -1 )
|
||||
{
|
||||
// default width/precision
|
||||
fmt = _T("%f");
|
||||
}
|
||||
else if ( m_precision == -1 )
|
||||
if ( m_precision == -1 && m_width != -1)
|
||||
{
|
||||
// default precision
|
||||
fmt.Printf(_T("%%%d.f"), m_width);
|
||||
}
|
||||
else
|
||||
else if ( m_precision != -1 && m_width == -1)
|
||||
{
|
||||
// default width
|
||||
fmt.Printf(_T("%%.%df"), m_precision);
|
||||
}
|
||||
else if ( m_precision != -1 && m_width != -1 )
|
||||
{
|
||||
fmt.Printf(_T("%%%d.%df"), m_width, m_precision);
|
||||
}
|
||||
else
|
||||
{
|
||||
// default width/precision
|
||||
fmt = _T("%f");
|
||||
}
|
||||
|
||||
return wxString::Format(fmt, m_valueOld);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user