made wxAcceleratorTable work with buttons in wxGTK too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@52614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -174,6 +174,7 @@ wxGTK:
|
|||||||
- Fixed wxBitmapButton to use focus and hover bitmaps correctly.
|
- Fixed wxBitmapButton to use focus and hover bitmaps correctly.
|
||||||
- Fixed race condition which could cause idle processing to stop without
|
- Fixed race condition which could cause idle processing to stop without
|
||||||
processing all pending events.
|
processing all pending events.
|
||||||
|
- wxAcceleratorTable now works with buttons too.
|
||||||
|
|
||||||
wxMac:
|
wxMac:
|
||||||
|
|
||||||
|
@@ -71,8 +71,7 @@ which modifier key is held down.}
|
|||||||
\section{\class{wxAcceleratorTable}}\label{wxacceleratortable}
|
\section{\class{wxAcceleratorTable}}\label{wxacceleratortable}
|
||||||
|
|
||||||
An accelerator table allows the application to specify a table of keyboard shortcuts for
|
An accelerator table allows the application to specify a table of keyboard shortcuts for
|
||||||
menus or other commands. On Windows, menu or button commands are supported; on GTK,
|
menu or button commands.
|
||||||
only menu commands are supported.
|
|
||||||
|
|
||||||
The object {\bf wxNullAcceleratorTable} is defined to be a table with no data, and is the
|
The object {\bf wxNullAcceleratorTable} is defined to be a table with no data, and is the
|
||||||
initial accelerator table for a window.
|
initial accelerator table for a window.
|
||||||
|
@@ -1051,8 +1051,18 @@ gtk_window_key_press_callback( GtkWidget *widget,
|
|||||||
int command = ancestor->GetAcceleratorTable()->GetCommand( event );
|
int command = ancestor->GetAcceleratorTable()->GetCommand( event );
|
||||||
if (command != -1)
|
if (command != -1)
|
||||||
{
|
{
|
||||||
wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
|
wxCommandEvent menu_event( wxEVT_COMMAND_MENU_SELECTED, command );
|
||||||
ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
|
ret = ancestor->GetEventHandler()->ProcessEvent( menu_event );
|
||||||
|
|
||||||
|
if ( !ret )
|
||||||
|
{
|
||||||
|
// if the accelerator wasn't handled as menu event, try
|
||||||
|
// it as button click (for compatibility with other
|
||||||
|
// platforms):
|
||||||
|
wxCommandEvent button_event( wxEVT_COMMAND_BUTTON_CLICKED, command );
|
||||||
|
ret = ancestor->GetEventHandler()->ProcessEvent( button_event );
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (ancestor->IsTopLevel())
|
if (ancestor->IsTopLevel())
|
||||||
|
Reference in New Issue
Block a user