From a8f3e0da7078f756300c07ef0051e3e7d291b931 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com> Date: Sun, 17 Dec 2023 16:05:01 +0100 Subject: [PATCH] Get rid of of unsupported overloads of wxIntProperty::DoValidation() wxIntProperty::DoValidation() overloads for wxLongLong_t and wxULongLong_t parameters are not supported because for these types there are no direct conversions to wxVariant. Arguments of such types will be handled by overloads for wxLongLong and wxULongLong. --- include/wx/propgrid/props.h | 14 -------------- src/propgrid/props.cpp | 22 ---------------------- 2 files changed, 36 deletions(-) diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index 3a4c3f513e..91e6e064ab 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -215,14 +215,6 @@ private: wxPGValidationInfo* pValidationInfo, int mode = wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE ); - -#if defined(wxLongLong_t) - static bool DoValidation( const wxNumericProperty* property, - wxLongLong_t& value, - wxPGValidationInfo* pValidationInfo, - int mode = - wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE ); -#endif // wxLongLong_t #endif // wxUSE_LONGLONG static bool DoValidation(const wxNumericProperty* property, long& value, @@ -274,12 +266,6 @@ private: wxULongLong& value, wxPGValidationInfo* pValidationInfo, int mode =wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE); -#if defined(wxULongLong_t) - static bool DoValidation(const wxNumericProperty* property, - wxULongLong_t& value, - wxPGValidationInfo* pValidationInfo, - int mode =wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE); -#endif // wxULongLong_t #endif // wxUSE_LONGLONG static bool DoValidation(const wxNumericProperty* property, long& value, diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index 07a69b842c..ebe93c82c8 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -470,17 +470,6 @@ bool wxIntProperty::DoValidation( const wxNumericProperty* property, pValidationInfo, mode, wxLongLong(wxPG_LLONG_MIN), wxLongLong(wxPG_LLONG_MAX)); } - -#if defined(wxLongLong_t) -bool wxIntProperty::DoValidation( const wxNumericProperty* property, - wxLongLong_t& value, - wxPGValidationInfo* pValidationInfo, - int mode ) -{ - return property->DoNumericValidation(value, pValidationInfo, - mode, wxPG_LLONG_MIN, wxPG_LLONG_MAX); -} -#endif // wxLongLong_t #endif // wxUSE_LONGLONG bool wxIntProperty::DoValidation(const wxNumericProperty* property, @@ -743,17 +732,6 @@ bool wxUIntProperty::DoValidation(const wxNumericProperty* property, return property->DoNumericValidation(value, pValidationInfo, mode, wxULongLong(0), wxULongLong(wxPG_ULLONG_MAX)); } - -#if defined(wxULongLong_t) -bool wxUIntProperty::DoValidation(const wxNumericProperty* property, - wxULongLong_t& value, - wxPGValidationInfo* pValidationInfo, - int mode ) -{ - return property->DoNumericValidation(value, pValidationInfo, - mode, 0, wxPG_ULLONG_MAX); -} -#endif // wxULongLong_t #endif // wxUSE_LONGLONG bool wxUIntProperty::DoValidation(const wxNumericProperty* property,