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

Simplify after recent changes by adding DoSetDigitsAndUpdate()

Browse Source 
There is no need for a separate UpdateAfterDigitsChange(), it is always
called together with DoSetDigits().
This commit is contained in:
Vadim Zeitlin
2021-04-25 20:08:05 +01:00
parent 6c9c0ba02b
commit c16f85bd4d
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/spinctlg.h
View File

@@ -430,11 +430,11 @@ private:
// specified increment without loss of precision. // specified increment without loss of precision.
static unsigned DetermineDigits(double inc); static unsigned DetermineDigits(double inc);
// Set the number of digits and the format unconditionally. // Just set the number of digits and the format unconditionally.
void DoSetDigits(unsigned digits); void DoSetDigits(unsigned digits);
// Update the appearance after the number of digits has changed. // Call DoSetDigits() and update the appearance.
void UpdateAfterDigitsChange(); void DoSetDigitsAndUpdate(unsigned digits);
wxString m_format; wxString m_format;

14
src/generic/spinctlg.cpp
View File

@@ -759,11 +759,7 @@ void wxSpinCtrlDouble::SetIncrement(double inc)
// could be undesirable, but we do increase it if the current number is not // could be undesirable, but we do increase it if the current number is not
// high enough to show the numbers without losing precision. // high enough to show the numbers without losing precision.
if ( digits > m_digits ) if ( digits > m_digits )
{ DoSetDigitsAndUpdate(digits);
DoSetDigits(digits);
UpdateAfterDigitsChange();
}
} }
void wxSpinCtrlDouble::SetDigits(unsigned digits) void wxSpinCtrlDouble::SetDigits(unsigned digits)
@@ -773,13 +769,13 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits)
if ( digits == m_digits ) if ( digits == m_digits )
return; return;
DoSetDigits(digits); DoSetDigitsAndUpdate(digits);
UpdateAfterDigitsChange();
} }
void wxSpinCtrlDouble::UpdateAfterDigitsChange() void wxSpinCtrlDouble::DoSetDigitsAndUpdate(unsigned digits)
{ {
DoSetDigits(digits);
ResetTextValidator(); ResetTextValidator();
m_textCtrl->InvalidateBestSize(); m_textCtrl->InvalidateBestSize();