Added Cocoa_acceptsFirstMouse.

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

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index 50a583c5d2f0f0492cb903fe0944849dadc01ea2..7fb9c79dd18600243fdb88f9365de1767199d4e7 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -32,6 +32,8 @@ public:
     virtual wxWindow* GetWxWindow() const
     {  return NULL;    }
     virtual void Cocoa_FrameChanged(void) = 0;
     virtual wxWindow* GetWxWindow() const
     {  return NULL;    }
     virtual void Cocoa_FrameChanged(void) = 0;

+    virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
+    {   return false; }

     virtual bool Cocoa_drawRect(const NSRect &rect)
     {   return false; }
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent)
     virtual bool Cocoa_drawRect(const NSRect &rect)
     {   return false; }
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent)

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index 364fa030594906b1508ac51100ad67b02f055c17..72c68998689456aef19bd57569c14ca9492be65d 100644 (file)
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -79,6 +79,15 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
 WX_IMPLEMENT_POSER(wxPoserNSView);
 @implementation wxPoserNSView : NSView
 
 WX_IMPLEMENT_POSER(wxPoserNSView);
 @implementation wxPoserNSView : NSView
 

+- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
+{
+    bool acceptsFirstMouse = false;
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if(!win || !win->Cocoa_acceptsFirstMouse(acceptsFirstMouse, theEvent))
+        acceptsFirstMouse = [super acceptsFirstMouse:theEvent];
+    return acceptsFirstMouse;
+}
+

 - (void)drawRect: (NSRect)rect
 {
     wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
 - (void)drawRect: (NSRect)rect
 {
     wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);