support for simulating focus events since not all controls can be focused

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

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index c97e979c8a8b113de4afc2f239b81cd8153b626f..3cfa8817f21bcf2da4c5856055bef411e93fcd10 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -286,6 +286,7 @@ public:
 
     virtual bool        OSXHandleClicked( double timestampsec );
     virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
 
     virtual bool        OSXHandleClicked( double timestampsec );
     virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );

+    virtual void        OSXSimulateFocusEvents();

 
     bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
     
 
     bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
     

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 6fe7e14929b71efe8f54c99a40fb0331c13bedb0..fadfabf4bd848ce28757db0f879d4b9bd5eeb844 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -602,6 +602,25 @@ void wxWindowMac::SetFocus()
     GetPeer()->SetFocus() ;
 }
 
     GetPeer()->SetFocus() ;
 }
 

+void wxWindowMac::OSXSimulateFocusEvents()
+{
+    wxWindow* former = FindFocus() ;
+    if ( former != NULL && former != this )
+    {
+        {
+            wxFocusEvent event( wxEVT_KILL_FOCUS, former->GetId());
+            event.SetEventObject(former);
+            former->HandleWindowEvent(event) ;
+        }
+
+        {
+            wxFocusEvent event(wxEVT_SET_FOCUS, former->GetId());
+            event.SetEventObject(former);
+            former->HandleWindowEvent(event);
+        }
+    }
+}
+

 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;