mouse event handling extended

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index f5598a3c9f069377647acfbcf545f2e64e619331..a78d68ecf04d1be0f9aa35656a2f276642d063db 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -242,7 +242,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -267,7 +267,10 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
     WindowRef window ;
     short windowPart = ::FindWindow(point, &window);
 
     WindowRef window ;
     short windowPart = ::FindWindow(point, &window);
 

-    if ( IsWindowActive(window) && windowPart == inContent )
+    // either we really are active or we are capturing mouse events
+
+    if ( (IsWindowActive(window) && windowPart == inContent) || 
+        (wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindow() == toplevelWindow) )

     {
         switch ( GetEventKind( event ) )
         {
     {
         switch ( GetEventKind( event ) )
         {

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index f5598a3c9f069377647acfbcf545f2e64e619331..a78d68ecf04d1be0f9aa35656a2f276642d063db 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -242,7 +242,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -267,7 +267,10 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
     WindowRef window ;
     short windowPart = ::FindWindow(point, &window);
 
     WindowRef window ;
     short windowPart = ::FindWindow(point, &window);
 

-    if ( IsWindowActive(window) && windowPart == inContent )
+    // either we really are active or we are capturing mouse events
+
+    if ( (IsWindowActive(window) && windowPart == inContent) || 
+        (wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindow() == toplevelWindow) )

     {
         switch ( GetEventKind( event ) )
         {
     {
         switch ( GetEventKind( event ) )
         {