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

Refactor wxPropertyGrid::OnComboItemPaint

Browse Source 
Make the code more readable by reducing scope of some local variables, by simplifying their initialization, etc.
This commit is contained in:
Artur Wieczorek
2015-07-05 21:14:50 +02:00
parent b7f1ac40f4
commit a253cdb413
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/propgrid/editors.cpp
View File

@@ -731,20 +731,18 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
wxString text; wxString text;
const wxPGChoices& choices = p->GetChoices(); const wxPGChoices& choices = p->GetChoices();
const wxPGCommonValue* comVal = NULL;
int comVals = p->GetDisplayedCommonValueCount();
int comValIndex = -1; int comValIndex = -1;
int choiceCount = 0; const int choiceCount = choices.IsOk()? choices.GetCount(): 0;
if ( choices.IsOk() )
choiceCount = choices.GetCount();
if ( item >= choiceCount && comVals > 0 ) if ( item >= choiceCount && p->GetDisplayedCommonValueCount() > 0 )
{ {
comValIndex = item - choiceCount; comValIndex = item - choiceCount;
comVal = GetCommonValue(comValIndex);
if ( !p->IsValueUnspecified() ) if ( !p->IsValueUnspecified() )
text = comVal->GetLabel(); {
const wxPGCommonValue* cv = GetCommonValue(comValIndex);
text = cv->GetLabel();
}
} }
else else
{ {