From 6b54668b4f1567593d7703ad50a86d7995adcb2f Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 26 Aug 2007 13:49:19 +0000
Subject: [PATCH] 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
---
src/msw/combobox.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 9a3f40c653..8ced094638 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -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
--
2.47.2