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

Fix and refactor wxString wxPGProperty::GetFlagsAsString and SetFlagsAsString.

Browse Source 
Fixes the bug which could be observed if string containing more then one flag entry was provided to wxPGProperty::SetFlagsFromString. In this case property flags were not set properly (were not set all) due to the error in splitting the string into tokens (whole string instead of its individual token was taken to compare).
Lookup table used to map between flag values and their names is redesigned in order to reduce the size and to make indexing simpler. There are no longer NULL entries in the table and every flag name is identified explicitly by the corresponding flag value and not by the index of the name entry in the table. Thanks to this the relation between flag value and flag name is more clear and the loops in wxPGProperty::GetFlagsAsString/SetFlagsAsString can be simplified.
This commit is contained in:
Artur Wieczorek 2015-06-14 17:07:24 +02:00
parent 2bc4357088
commit 87f0b6fe80
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/propgrid/property.cpp
View File

@ -1865,44 +1865,33 @@ wxVariant wxPGProperty::GetAttributesAsList() const
return v;
}
// Slots of utility flags are NULL
const unsigned int gs_propFlagToStringSize = 14;
// Utility flags are excluded.
// Store the literals in the internal representation for better performance.
static const wxStringCharType* const gs_propFlagToString[gs_propFlagToStringSize] = {
NULL,
wxS("DISABLED"),
wxS("HIDDEN"),
NULL,
wxS("NOEDITOR"),
wxS("COLLAPSED"),
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
static const struct
{
wxPGProperty::FlagType m_flag;
const wxStringCharType* m_name;
} gs_propFlagToString[4] =
{ { wxPG_PROP_DISABLED, wxS("DISABLED") },
{ wxPG_PROP_HIDDEN, wxS("HIDDEN") },
{ wxPG_PROP_NOEDITOR, wxS("NOEDITOR") },
{ wxPG_PROP_COLLAPSED, wxS("COLLAPSED") } };
wxString wxPGProperty::GetFlagsAsString( FlagType flagsMask ) const
{
wxString s;
int relevantFlags = m_flags & flagsMask & wxPG_STRING_STORED_FLAGS;
FlagType a = 1;
const FlagType relevantFlags = m_flags & flagsMask & wxPG_STRING_STORED_FLAGS;
for ( unsigned int i = 0; i < gs_propFlagToStringSize; i++ )
for ( unsigned int i = 0; i < WXSIZEOF(gs_propFlagToString); i++ )
{
if ( relevantFlags & a )
if ( relevantFlags & gs_propFlagToString[i].m_flag )
{
const wxStringCharType* fs = gs_propFlagToString[i];
wxASSERT(fs);
if ( !s.empty() )
s << wxS("|");
s << fs;
{
s.append(wxS("|"));
}
s.append(gs_propFlagToString[i].m_name);
}
a <<= 1;
}
return s;
@ -1913,12 +1902,11 @@ void wxPGProperty::SetFlagsFromString( const wxString& str )
FlagType flags = 0;
WX_PG_TOKENIZER1_BEGIN(str, wxS('|'))
for ( unsigned int i = 0; i < gs_propFlagToStringSize; i++ )
for ( unsigned int i = 0; i < WXSIZEOF(gs_propFlagToString); i++ )
{
const wxStringCharType* fs = gs_propFlagToString[i];
if ( fs && str == fs )
if ( token == gs_propFlagToString[i].m_name )
{
flags |= (1<<i);
flags |= gs_propFlagToString[i].m_flag;
break;
}
}