solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Specify what is the limit set by wxPGProperty::SetMaxLength()

Browse source 
It needs to be stated clearly that the limit applies only to the text
the user can enter in the editor associated with property.
This constraint does not apply to the length of text represenations
of values set programmatically.
Corresponding test were added.
This commit is contained in:
Artur Wieczorek 2022-12-22 20:53:44 +02:00
parent f1bb6080a2
commit cf661f9293
3 changed files with 97 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
interface/wx/propgrid/property.h
View file

@ -1955,9 +1955,15 @@ public:
void SetLabel( const wxString& label );
/**
Set maximum length of the text the user can enter in the text editor.
If it is 0, the length is not limited and the text can be as long as
it is supported by the underlying native text control widget.
Set maximum length of the text the user can enter in the text editor
associated with property.
It does not affect a text representation of the value already stored
when the limit is set, nor does it affect the length of the text
representation of the value set programmatically e.g. with SetValue()
or wxPropertyGridInterface::SetPropertyValue().
If @a maxLen is 0, the length is not limited and the text can be
as long as it is supported by the underlying native text control
widget.
@return
Returns @true if maximum length was set.

99
samples/propgrid/tests.cpp
View file

@ -1023,33 +1023,74 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
RT_START_TEST(MaxLength)
wxPGProperty* prop1 = pgman->GetProperty("StringProperty");
wxString propSetValStr = "12345678901234567890";
prop1->SetValueFromString(propSetValStr);
if ( !prop1->SetMaxLength(10) )
RT_FAILURE();
if ( prop1->GetMaxLength() != 10 )
RT_FAILURE();
wxString propGetValStr = prop1->GetValueAsString();
if ( propGetValStr != propSetValStr )
RT_FAILURE();
prop1->SetValueFromString(propSetValStr);
propGetValStr = prop1->GetValueAsString();
if ( propGetValStr != propSetValStr )
RT_FAILURE();
if ( !prop1->SetMaxLength(-1) )
RT_FAILURE();
if ( prop1->GetMaxLength() != 0 )
RT_FAILURE();
propGetValStr = prop1->GetValueAsString();
if ( propGetValStr != propSetValStr )
RT_FAILURE();
wxPGProperty* prop2 = pgman->GetProperty("LongStringProp");
propSetValStr = "123456789012345678901234567890";
prop2->SetValueFromString(propSetValStr);
if ( !prop2->SetMaxLength(20) )
RT_FAILURE();
if ( prop2->GetMaxLength() != 20 )
RT_FAILURE();
propGetValStr = prop2->GetValueAsString();
if ( propGetValStr != propSetValStr )
RT_FAILURE();
prop2->SetValueFromString(propSetValStr);
propGetValStr = prop2->GetValueAsString();
if ( propGetValStr != propSetValStr )
RT_FAILURE();
wxPGProperty* prop3 = pgman->GetProperty("IntProperty");
if ( !prop3->SetMaxLength(30) )
const long propSetValInt = 1234567;
prop3->SetValueFromInt(propSetValInt);
if ( !prop3->SetMaxLength(4) )
RT_FAILURE();
if ( prop3->GetMaxLength() != 30 )
if ( prop3->GetMaxLength() != 4 )
RT_FAILURE();
int propGetValInt = prop3->GetValue().GetLong();
if ( propGetValInt != propSetValInt )
RT_FAILURE();
prop3->SetValueFromInt(propSetValInt);
propGetValInt = prop3->GetValue().GetLong();
if ( propGetValInt != propSetValInt )
RT_FAILURE();
wxPGProperty* prop4 = pgman->GetProperty("ArrayStringProperty");
if ( !prop4->SetMaxLength(40) )
const wxString arrStr[3] { "01234567890", "abcdefghijk", "ABCDEFGHIJK" };
wxArrayString propSetValArrStr(WXSIZEOF(arrStr), arrStr);
prop4->SetValue(wxVariant(propSetValArrStr));
if ( !prop4->SetMaxLength(25) )
RT_FAILURE();
if ( prop4->GetMaxLength() != 40 )
if ( prop4->GetMaxLength() != 25 )
RT_FAILURE();
wxArrayString propGetValArrStr = prop4->GetValue().GetArrayString();
if ( propGetValArrStr != propSetValArrStr )
RT_FAILURE();
prop4->SetValueFromString(wxVariant(propSetValArrStr));
propGetValStr = prop4->GetValueAsString();
if ( propGetValArrStr != propSetValArrStr )
RT_FAILURE();
wxPGProperty* prop5 = pgman->GetProperty("EnumProperty");
if ( prop5->SetMaxLength(50) )
@ -1066,32 +1107,66 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
pg = pgman->GetGrid();
wxPGProperty* prop1 = pgman->GetProperty("StringProperty");
if ( !pg->SetPropertyMaxLength("StringProperty", 110) )
wxString propSetValStr = "12345678901234567890";
pg->SetPropertyValue(prop1, propSetValStr);
if ( !pg->SetPropertyMaxLength("StringProperty", 15) )
RT_FAILURE();
if ( prop1->GetMaxLength() != 110 )
if ( prop1->GetMaxLength() != 15 )
RT_FAILURE();
wxString propGetValStr = pg->GetPropertyValueAsString(prop1);
if ( propGetValStr != propSetValStr )
RT_FAILURE();
pg->SetPropertyValue(prop1, propSetValStr);
propGetValStr = pg->GetPropertyValueAsString(prop1);
if ( propGetValStr != propSetValStr )
RT_FAILURE();
if ( !pg->SetPropertyMaxLength("StringProperty", -1) )
RT_FAILURE();
if ( prop1->GetMaxLength() != 0 )
RT_FAILURE();
propGetValStr = pg->GetPropertyValueAsString(prop1);
if ( propGetValStr != propSetValStr )
RT_FAILURE();
wxPGProperty* prop2 = pgman->GetProperty("LongStringProp");
if ( !pg->SetPropertyMaxLength("LongStringProp", 120) )
propSetValStr = "123456789012345678901234567890";
pg->SetPropertyValue(prop2, propSetValStr);
if ( !pg->SetPropertyMaxLength("LongStringProp", 25) )
RT_FAILURE();
if ( prop2->GetMaxLength() != 120 )
if ( prop2->GetMaxLength() != 25 )
RT_FAILURE();
propGetValStr = pg->GetPropertyValueAsString(prop2);
if ( propGetValStr != propSetValStr )
RT_FAILURE();
pg->SetPropertyValue(prop2, propSetValStr);
propGetValStr = pg->GetPropertyValueAsString(prop2);
if ( propGetValStr != propSetValStr )
RT_FAILURE();
wxPGProperty* prop3 = pgman->GetProperty("FloatProperty");
if ( !pg->SetPropertyMaxLength("FloatProperty", 130) )
double propSetValFloat = 1234.567;
pg->SetPropertyValue(prop3, propSetValFloat);
if ( !pg->SetPropertyMaxLength("FloatProperty", 5) )
RT_FAILURE();
if ( prop3->GetMaxLength() != 130 )
if ( prop3->GetMaxLength() != 5 )
RT_FAILURE();
double propGetValFloat = pg->GetPropertyValueAsDouble(prop3);
if ( propGetValFloat != propSetValFloat )
RT_FAILURE();
if ( pg->SetPropertyMaxLength("ColourProperty", 140) )
if ( !pg->SetPropertyMaxLength("FloatProperty", -1) )
RT_FAILURE();
if ( prop3->GetMaxLength() != 0 )
RT_FAILURE();
propGetValFloat = pg->GetPropertyValueAsDouble(prop3);
if ( propGetValFloat != propSetValFloat )
RT_FAILURE();
if ( pg->SetPropertyMaxLength("BoolProperty", 150) )
if ( pg->SetPropertyMaxLength("ColourProperty", 35) )
RT_FAILURE();
if ( pg->SetPropertyMaxLength("BoolProperty", 3) )
RT_FAILURE();
}

8
src/propgrid/propgridpagestate.cpp
View file

@ -1250,14 +1250,8 @@ bool wxPropertyGridPageState::DoSetPropertyValueString( wxPGProperty* p, const w
int flags = wxPG_REPORT_ERROR|wxPG_FULL_VALUE|wxPG_PROGRAMMATIC_VALUE;
wxVariant variant = p->GetValueRef();
bool res;
if ( p->GetMaxLength() <= 0 )
res = p->StringToValue( variant, value, flags );
else
res = p->StringToValue( variant, value.Mid(0,p->GetMaxLength()), flags );
if ( res )
if ( p->StringToValue(variant, value, flags) )
{
p->SetValue(variant);
if ( p == m_pPropGrid->GetSelection() && IsDisplayed() )