X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/954fc50b6edca29cfc1b042c1227c91023580131..f2616db56739e4962f683f59ac9e207756efe23c:/src/mac/window.cpp

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 32f583f2ec..3f12059d91 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -264,11 +264,9 @@ void wxWindowMac::SetFocus()
 		    }
 			#endif // wxUSE_CARET
    			// panel wants to track the window which was the last to have focus in it
-    		wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    		if ( panel )
-    		{
-        		panel->SetLastFocus((wxWindow*)this);
-    		}
+            wxChildFocusEvent eventFocus(this);
+            (void)GetEventHandler()->ProcessEvent(eventFocus);
+
       #ifndef __WXUNIVERSAL__
 			wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
 			if ( control && control->GetMacControl() )
@@ -1482,18 +1480,10 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
     // notice that it's also important to do it upwards the tree becaus
     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
-    wxWindowMac *win = this;
-    while ( win )
-    {
-        wxWindowMac *parent = win->GetParent();
-        wxPanel *panel = wxDynamicCast(parent, wxPanel);
-        if ( panel )
-        {
-            panel->SetLastFocus(win);
-        }
-
-        win = parent;
-    }
+    
+    // CS:don't know if this is still needed:
+    //wxChildFocusEvent eventFocus(this);
+    //(void)GetEventHandler()->ProcessEvent(eventFocus);
 
     event.Skip();
 }