Send activate/deactivate events for become/resign key

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 075d6dee87df7b19f25189735611cf0ee4130592..6283dabdfb9381769f81a37484ee27a5e6fc57f3 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -62,6 +62,8 @@ public:
     virtual void Cocoa_close(void);
     virtual bool Cocoa_windowShouldClose(void);
     virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);
     virtual void Cocoa_close(void);
     virtual bool Cocoa_windowShouldClose(void);
     virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);

+    virtual void CocoaNotification_DidBecomeKey(void);
+    virtual void CocoaNotification_DidResignKey(void);

 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;
 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 02a017515b03c3c9393c1748ab9839379e5b76b6..a3b1398a35d4412e572f8be5680626b991a0d4f9 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -132,6 +132,22 @@ void wxTopLevelWindowCocoa::Cocoa_wxMenuItemAction(wxMenuItem& item)
 {
 }
 
 {
 }
 

+void wxTopLevelWindowCocoa::CocoaNotification_DidBecomeKey(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaNotification_DidBecomeKey",this);
+    wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+void wxTopLevelWindowCocoa::CocoaNotification_DidResignKey(void)
+{
+    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaNotification_DidResignKey",this);
+    wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+

 void wxTopLevelWindowCocoa::Cocoa_close(void)
 {
     m_closed = true;
 void wxTopLevelWindowCocoa::Cocoa_close(void)
 {
     m_closed = true;


@@ -248,7 +264,7 @@ void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {

-    wxLogDebug("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+//    wxLogDebug("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);

 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];
 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];


@@ -261,7 +277,7 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;

-    wxLogDebug("wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+//    wxLogDebug("wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);

 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const


@@ -271,6 +287,6 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;

-    wxLogDebug("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+//    wxLogDebug("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);

 }
 
 }