Revert some changes from incorrect merge that discarded formatting, etc.

This commit is contained in:
Robin Dunn
2017-01-06 16:43:05 -08:00
parent 016d8f5af4
commit 9e5dd50914
3 changed files with 259 additions and 245 deletions

View File

@@ -398,7 +398,7 @@ public:
void GetPropertiesWithFlag( wxArrayPGProperty* targetArr,
wxPGProperty::FlagType flags,
bool inverse = false,
int iterFlags = wxPG_ITERATE_PROPERTIES|wxPG_ITERATE_HIDDEN|wxPG_ITERATE_CATEGORIES ) const;
int iterFlags = (wxPG_ITERATE_PROPERTIES|wxPG_ITERATE_HIDDEN|wxPG_ITERATE_CATEGORIES) ) const;
/**
Returns value of given attribute. If none found, returns wxNullVariant.