Make validation helper functions private in all numeric wxPG properties

wxUIntProperty::DoValidation() is already declared as private and the same access level should be applied to DoValidation() in other numeric properties because these functions are helpers intended for internal use only.
This commit is contained in:
Artur Wieczorek
2019-06-28 21:52:57 +02:00
parent 48adc38bbb
commit d0a61a09ec
3 changed files with 11 additions and 21 deletions

View File

@@ -123,6 +123,9 @@ Changes in behaviour which may result in build errors
- wxPGProperty ctors are not longer public since this class is intended to be - wxPGProperty ctors are not longer public since this class is intended to be
a base class and should not be instantiated directly. a base class and should not be instantiated directly.
- wxIntProperty::DoValidation() and wxFloatProperty::DoValidation() are
no longer public since they are helpers intended for internal use only.
3.1.3: (released 2019-??-??) 3.1.3: (released 2019-??-??)
---------------------------- ----------------------------

View File

@@ -212,6 +212,7 @@ public:
virtual wxValidator* DoGetValidator() const wxOVERRIDE; virtual wxValidator* DoGetValidator() const wxOVERRIDE;
virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE; virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE;
private:
// Validation helpers. // Validation helpers.
#if wxUSE_LONGLONG #if wxUSE_LONGLONG
static bool DoValidation( const wxNumericProperty* property, static bool DoValidation( const wxNumericProperty* property,
@@ -312,18 +313,19 @@ public:
virtual bool ValidateValue( wxVariant& value, virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const wxOVERRIDE; wxPGValidationInfo& validationInfo ) const wxOVERRIDE;
// Validation helper.
static bool DoValidation( const wxNumericProperty* property,
double& value,
wxPGValidationInfo* pValidationInfo,
int mode =
wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
static wxValidator* GetClassValidator(); static wxValidator* GetClassValidator();
virtual wxValidator* DoGetValidator () const wxOVERRIDE; virtual wxValidator* DoGetValidator () const wxOVERRIDE;
virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE; virtual wxVariant AddSpinStepValue(long stepScale) const wxOVERRIDE;
protected: protected:
int m_precision; int m_precision;
private:
// Validation helper.
static bool DoValidation(const wxNumericProperty* property,
double& value,
wxPGValidationInfo* pValidationInfo,
int mode = wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE);
}; };
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

View File

@@ -227,14 +227,6 @@ public:
static wxValidator* GetClassValidator(); static wxValidator* GetClassValidator();
virtual wxValidator* DoGetValidator() const; virtual wxValidator* DoGetValidator() const;
virtual wxVariant AddSpinStepValue(long stepScale) const; virtual wxVariant AddSpinStepValue(long stepScale) const;
/** Validation helper.
*/
static bool DoValidation( const wxPGProperty* property,
wxLongLong_t& value,
wxPGValidationInfo* pValidationInfo,
int mode =
wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
}; };
@@ -315,13 +307,6 @@ public:
virtual bool ValidateValue( wxVariant& value, virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const; wxPGValidationInfo& validationInfo ) const;
/** Validation helper.
*/
static bool DoValidation( const wxPGProperty* property,
double& value,
wxPGValidationInfo* pValidationInfo,
int mode =
wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
static wxValidator* GetClassValidator(); static wxValidator* GetClassValidator();
virtual wxValidator* DoGetValidator () const; virtual wxValidator* DoGetValidator () const;
virtual wxVariant AddSpinStepValue(long stepScale) const; virtual wxVariant AddSpinStepValue(long stepScale) const;