Add middle-item click support.

[wxWidgets.git] / src / mac / carbon / toplevel.cpp

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index e18ed8044b403600d0cb9953722ff67d9d19ac53..6903a408f8ba15892add8d28f8acc67b250d96f3 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -248,9 +248,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
 wxWindow* g_MacLastWindow = NULL ;
 
-static EventMouseButton lastButton = 0 ;
+EventMouseButton g_lastButton = 0 ;
 
-static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
+void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
 {
     UInt32 modifiers = cEvent.GetParameter<UInt32>(kEventParamKeyModifiers, typeUInt32) ;
     Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
@@ -274,19 +274,19 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
         button = kEventMouseButtonSecondary ;
 
     // otherwise we report double clicks by connecting a left click with a ctrl-left click
-    if ( clickCount > 1 && button != lastButton )
+    if ( clickCount > 1 && button != g_lastButton )
         clickCount = 1 ;
 
     // we must make sure that our synthetic 'right' button corresponds in
     // mouse down, moved and mouse up, and does not deliver a right down and left up
 
     if ( cEvent.GetKind() == kEventMouseDown )
-        lastButton = button ;
+        g_lastButton = button ;
 
     if ( button == 0 )
-        lastButton = 0 ;
-    else if ( lastButton )
-        button = lastButton ;
+        g_lastButton = 0 ;
+    else if ( g_lastButton )
+        button = g_lastButton ;
 
     // determine the correct down state, wx does not want a 'down' for a mouseUp event,
     // while mac delivers this button