From 7cc504b42dfffc1c431979025c106cd6b16cbec7 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 17 Jun 2009 21:31:50 +0000 Subject: [PATCH] Avoid disabling comboboxes completely on 10.4 (caused by rev 56156) See also ticket 10047 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/combobox.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index f6d9ee474c..35de671962 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -154,6 +154,13 @@ protected: void OnFocus( wxFocusEvent& event ) { + // Unfortunately the fix below completely disables the combobox on Mac OS 10.4 (and presumably below) + if (UMAGetSystemVersion() <= 0x1040) + { + event.Skip(); + return; + } + // in case the textcontrol gets the focus we propagate // it to the parent's handlers. wxFocusEvent evt2(event.GetEventType(),m_cb->GetId());