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

Make DetermineDigits() reusable in other ports

Browse Source 
Move this function, and the associated constant, to common code.

This required moving wxSpinCtrlDouble::Create() implementation to the
source file, but there are no real changes.
This commit is contained in:
Vadim Zeitlin
2021-04-25 20:14:46 +01:00
parent c16f85bd4d
commit a44bb13a0c
4 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/generic/spinctlg.cpp
View File

@@ -723,10 +723,26 @@ void wxSpinCtrl::ResetTextValidator()
// wxSpinCtrlDouble
//-----------------------------------------------------------------------------
#define SPINCTRLDBL_MAX_DIGITS 20
wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase);
bool
wxSpinCtrlDouble::Create(wxWindow *parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
long style,
double min, double max, double initial,
double inc,
const wxString& name)
{
DoSetDigits(wxSpinCtrlImpl::DetermineDigits(inc));
return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
style, min, max, initial,
inc, name);
}
void wxSpinCtrlDouble::DoSendEvent()
{
wxSpinDoubleEvent event( wxEVT_SPINCTRLDOUBLE, GetId());
@@ -753,7 +769,7 @@ void wxSpinCtrlDouble::SetIncrement(double inc)
DoSetIncrement(inc);
const unsigned digits = DetermineDigits(inc);
const unsigned digits = wxSpinCtrlImpl::DetermineDigits(inc);
// We don't decrease the number of digits here, as this is unnecessary and
// could be undesirable, but we do increase it if the current number is not
@@ -764,7 +780,8 @@ void wxSpinCtrlDouble::SetIncrement(double inc)
void wxSpinCtrlDouble::SetDigits(unsigned digits)
{
wxCHECK_RET( digits <= SPINCTRLDBL_MAX_DIGITS, "too many digits for wxSpinCtrlDouble" );
wxCHECK_RET( digits <= wxSpinCtrlImpl::SPINCTRLDBL_MAX_DIGITS,
"too many digits for wxSpinCtrlDouble" );
if ( digits == m_digits )
return;
@@ -798,22 +815,6 @@ void wxSpinCtrlDouble::ResetTextValidator()
#endif // wxUSE_VALIDATORS
}
/* static */
unsigned wxSpinCtrlDouble::DetermineDigits(double inc)
{
// TODO-C++11: Use std::modf() to get the fractional part.
inc = fabs(inc);
inc -= static_cast<int>(inc);
if ( inc > 0.0 )
{
return wxMin(SPINCTRLDBL_MAX_DIGITS, -static_cast<int>(floor(log10(inc))));
}
else
{
return 0;
}
}
#endif // wxUSE_SPINBTN
#endif // !wxPort-with-native-spinctrl