Don't assert in update handler if read-only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
91a6c65558
commit
6b54668b4f
@ -374,7 +374,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
|
||||
if (wxIsCtrlDown())
|
||||
{
|
||||
WPARAM vkey = pMsg->wParam;
|
||||
|
||||
|
||||
switch (vkey)
|
||||
{
|
||||
case 'C':
|
||||
@ -387,7 +387,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return wxChoice::MSWShouldPreProcessMessage(pMsg);
|
||||
}
|
||||
|
||||
@ -799,12 +799,12 @@ void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
|
||||
|
||||
void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
|
||||
{
|
||||
event.Enable(HasSelection() && IsEditable());
|
||||
event.Enable(IsEditable() && HasSelection());
|
||||
}
|
||||
|
||||
void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
|
||||
{
|
||||
event.Enable(GetLastPosition() > 0);
|
||||
event.Enable(IsEditable() && GetLastPosition() > 0);
|
||||
}
|
||||
|
||||
#endif // wxUSE_COMBOBOX
|
||||
|
Loading…
Reference in New Issue
Block a user