Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes for clickCount... even sometimes when respondsToSelector returned true we'd get a crash, so only check clickCount for up and down events.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-03-03 23:23:51 +00:00
parent c83d207b76
commit 08c1b1340d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/cocoa/window.mm
View File

@@ -265,8 +265,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
// these parameters are not given for all events // these parameters are not given for all events
UInt32 button = [nsEvent buttonNumber]; UInt32 button = [nsEvent buttonNumber];
UInt32 clickCount = 0; UInt32 clickCount = 0;
if ( [nsEvent respondsToSelector:@selector(clickCount:)] )
[nsEvent clickCount];
wxevent.m_x = screenMouseLocation.x; wxevent.m_x = screenMouseLocation.x;
wxevent.m_y = screenMouseLocation.y; wxevent.m_y = screenMouseLocation.y;
@@ -274,7 +272,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
wxevent.m_controlDown = modifiers & NSControlKeyMask; wxevent.m_controlDown = modifiers & NSControlKeyMask;
wxevent.m_altDown = modifiers & NSAlternateKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask;
wxevent.m_metaDown = modifiers & NSCommandKeyMask; wxevent.m_metaDown = modifiers & NSCommandKeyMask;
wxevent.m_clickCount = clickCount;
wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ; wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
UInt32 mouseChord = 0; UInt32 mouseChord = 0;
@@ -347,6 +344,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
case NSLeftMouseDown : case NSLeftMouseDown :
case NSRightMouseDown : case NSRightMouseDown :
case NSOtherMouseDown : case NSOtherMouseDown :
clickCount = [nsEvent clickCount];
switch ( button ) switch ( button )
{ {
case 0 : case 0 :
@@ -369,6 +367,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
case NSLeftMouseUp : case NSLeftMouseUp :
case NSRightMouseUp : case NSRightMouseUp :
case NSOtherMouseUp : case NSOtherMouseUp :
clickCount = [nsEvent clickCount];
switch ( button ) switch ( button )
{ {
case 0 : case 0 :
@@ -421,6 +420,9 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
default : default :
break ; break ;
} }
wxevent.m_clickCount = clickCount;
} }
@implementation wxNSView @implementation wxNSView