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

Always show label of unspecified value item while drawing popup menu

Browse Source 
The label of "unspecified value" shouldn't be displayed in the edit field
but it should always be shown on the popup menu list.
This commit is contained in:
Artur Wieczorek
2020-02-09 20:38:07 +01:00
parent 687f679705
commit 0b7f1e7e91
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/propgrid/editors.cpp
View File

@@ -719,11 +719,10 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
int comValIndex = -1; int comValIndex = -1;
const int choiceCount = choices.IsOk()? choices.GetCount(): 0; const int choiceCount = choices.IsOk()? choices.GetCount(): 0;
if ( item >= choiceCount && p->GetDisplayedCommonValueCount() > 0 ) if ( item >= choiceCount && p->GetDisplayedCommonValueCount() > 0 )
{ {
comValIndex = item - choiceCount; comValIndex = item - choiceCount;
if ( !p->IsValueUnspecified() ) if ( !p->IsValueUnspecified() || !(flags & wxODCB_PAINTING_CONTROL) )
{ {
const wxPGCommonValue* cv = GetCommonValue(comValIndex); const wxPGCommonValue* cv = GetCommonValue(comValIndex);
text = cv->GetLabel(); text = cv->GetLabel();
@@ -747,7 +746,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
const wxBitmap* itemBitmap = NULL; const wxBitmap* itemBitmap = NULL;
if ( choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 ) if ( comValIndex == -1 && choices.IsOk() && choices.Item(item).GetBitmap().IsOk() )
itemBitmap = &choices.Item(item).GetBitmap(); itemBitmap = &choices.Item(item).GetBitmap();
// //