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

Don't assert in update handler if read-only

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-26 13:49:19 +00:00
parent 91a6c65558
commit 6b54668b4f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/combobox.cpp
View File

@@ -374,7 +374,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
if (wxIsCtrlDown()) if (wxIsCtrlDown())
{ {
WPARAM vkey = pMsg->wParam; WPARAM vkey = pMsg->wParam;
switch (vkey) switch (vkey)
{ {
case 'C': case 'C':
@@ -387,7 +387,7 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
return false; return false;
} }
} }
return wxChoice::MSWShouldPreProcessMessage(pMsg); return wxChoice::MSWShouldPreProcessMessage(pMsg);
} }
@@ -799,12 +799,12 @@ void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event) void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
{ {
event.Enable(HasSelection() && IsEditable()); event.Enable(IsEditable() && HasSelection());
} }
void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
{ {
event.Enable(GetLastPosition() > 0); event.Enable(IsEditable() && GetLastPosition() > 0);
} }
#endif // wxUSE_COMBOBOX #endif // wxUSE_COMBOBOX