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

mouse events added, menu id 0 safety check

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-09-11 18:18:05 +00:00
parent 69991fff84
commit 6d56534934
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mac/app.cpp
View File

@@ -299,6 +299,8 @@ void wxApp::MacNewFile()
{ kEventClassMouse , kEventMouseDown } , { kEventClassMouse , kEventMouseDown } ,
{ kEventClassMouse , kEventMouseMoved } , { kEventClassMouse , kEventMouseMoved } ,
{ kEventClassMouse , kEventMouseUp } ,
{ kEventClassMouse , kEventMouseDragged } ,
{ 'WXMC' , 'WXMC' } { 'WXMC' , 'WXMC' }
} ; } ;
@@ -337,6 +339,8 @@ MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
// but have to use ReceiveNextEvent dealing with events manually, therefore we also have // but have to use ReceiveNextEvent dealing with events manually, therefore we also have
// deal with clicks in the menu bar explicitely // deal with clicks in the menu bar explicitely
pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{ {
OSStatus result = eventNotHandledErr ; OSStatus result = eventNotHandledErr ;
@@ -374,6 +378,13 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
} }
} }
break ; break ;
case kEventMouseDragged :
case kEventMouseUp :
{
if ( wxTheApp->s_captureWindow )
wxMacWindowEventHandler( handler , event , (void*) wxTheApp->s_captureWindow->MacGetTopLevelWindow() ) ;
}
break ;
case kEventMouseMoved : case kEventMouseMoved :
{ {
wxTheApp->MacHandleMouseMovedEvent( point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ; wxTheApp->MacHandleMouseMovedEvent( point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
@@ -404,7 +415,15 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR
wxMenuItem* item = NULL ; wxMenuItem* item = NULL ;
if ( mbar ) if ( mbar )
{
item = mbar->FindItem( id , &menu ) ; item = mbar->FindItem( id , &menu ) ;
// it is not 100 % sure that an menu of id 0 is really ours, safety check
if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef )
{
item = NULL ;
menu = NULL ;
}
}
if ( item == NULL || menu == NULL || mbar == NULL ) if ( item == NULL || menu == NULL || mbar == NULL )
return result ; return result ;
@@ -424,7 +443,7 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR
break ; break ;
case kEventCommandUpdateStatus: case kEventCommandUpdateStatus:
// eventually trigger an updateui round // eventually trigger an updateui round
result = noErr ; result = noErr ;
break ; break ;
default : default :
break ; break ;

21
src/mac/carbon/app.cpp
View File

@@ -299,6 +299,8 @@ void wxApp::MacNewFile()
{ kEventClassMouse , kEventMouseDown } , { kEventClassMouse , kEventMouseDown } ,
{ kEventClassMouse , kEventMouseMoved } , { kEventClassMouse , kEventMouseMoved } ,
{ kEventClassMouse , kEventMouseUp } ,
{ kEventClassMouse , kEventMouseDragged } ,
{ 'WXMC' , 'WXMC' } { 'WXMC' , 'WXMC' }
} ; } ;
@@ -337,6 +339,8 @@ MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
// but have to use ReceiveNextEvent dealing with events manually, therefore we also have // but have to use ReceiveNextEvent dealing with events manually, therefore we also have
// deal with clicks in the menu bar explicitely // deal with clicks in the menu bar explicitely
pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{ {
OSStatus result = eventNotHandledErr ; OSStatus result = eventNotHandledErr ;
@@ -374,6 +378,13 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
} }
} }
break ; break ;
case kEventMouseDragged :
case kEventMouseUp :
{
if ( wxTheApp->s_captureWindow )
wxMacWindowEventHandler( handler , event , (void*) wxTheApp->s_captureWindow->MacGetTopLevelWindow() ) ;
}
break ;
case kEventMouseMoved : case kEventMouseMoved :
{ {
wxTheApp->MacHandleMouseMovedEvent( point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ; wxTheApp->MacHandleMouseMovedEvent( point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
@@ -404,7 +415,15 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR
wxMenuItem* item = NULL ; wxMenuItem* item = NULL ;
if ( mbar ) if ( mbar )
{
item = mbar->FindItem( id , &menu ) ; item = mbar->FindItem( id , &menu ) ;
// it is not 100 % sure that an menu of id 0 is really ours, safety check
if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef )
{
item = NULL ;
menu = NULL ;
}
}
if ( item == NULL || menu == NULL || mbar == NULL ) if ( item == NULL || menu == NULL || mbar == NULL )
return result ; return result ;
@@ -424,7 +443,7 @@ static pascal OSStatus CommandEventHandler( EventHandlerCallRef handler , EventR
break ; break ;
case kEventCommandUpdateStatus: case kEventCommandUpdateStatus:
// eventually trigger an updateui round // eventually trigger an updateui round
result = noErr ; result = noErr ;
break ; break ;
default : default :
break ; break ;