From: Kevin Ollivier <kevino@theolliviers.com>
Date: Tue, 11 May 2004 05:26:24 +0000 (+0000)
Subject: Restore proper set and kill focus handling for user pane controls under wxMac.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5f254b1f3cf48ea4483aa9a728d1addb0b1f1e23

Restore proper set and kill focus handling for user pane controls under wxMac.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index b5f98056e4..78f8bc0f32 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -210,6 +210,8 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     wxFocusEvent event(wxEVT_KILL_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                    if (thisWindow->MacIsUserPane())
+                        result = noErr;
                 }
                 else
                 {
@@ -227,6 +229,8 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                    if (thisWindow->MacIsUserPane())
+                        result = noErr;
                 }
             }
             break ;