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

Test for result of searching for wxID_CANCEL button

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-13 22:56:09 +00:00
parent 8d60dc8aa0
commit 4455332266
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/listbox.cpp
View File

@@ -925,11 +925,15 @@ void wxListBox::OnChar(wxKeyEvent& event)
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */ /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) ) else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
{ {
// FIXME: look in ancestors, not just parent.
wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ; wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
if (win)
{
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( win ); new_event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( new_event ); win->GetEventHandler()->ProcessEvent( new_event );
} }
}
else if ( event.GetKeyCode() == WXK_TAB ) else if ( event.GetKeyCode() == WXK_TAB )
{ {
wxNavigationKeyEvent new_event; wxNavigationKeyEvent new_event;

4
src/mac/listbox.cpp
View File

@@ -925,11 +925,15 @@ void wxListBox::OnChar(wxKeyEvent& event)
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */ /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) ) else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
{ {
// FIXME: look in ancestors, not just parent.
wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ; wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
if (win)
{
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( win ); new_event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( new_event ); win->GetEventHandler()->ProcessEvent( new_event );
} }
}
else if ( event.GetKeyCode() == WXK_TAB ) else if ( event.GetKeyCode() == WXK_TAB )
{ {
wxNavigationKeyEvent new_event; wxNavigationKeyEvent new_event;