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

made wxAcceleratorTable work with buttons in wxGTK too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-03-18 16:21:15 +00:00
parent 8cd6a9ad50
commit b1bb04c5a6
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interface/accel.h
View File

@@ -96,8 +96,7 @@ public:
@wxheader{accel.h} @wxheader{accel.h}
An accelerator table allows the application to specify a table of keyboard An accelerator table allows the application to specify a table of keyboard
shortcuts for menus or other commands. On Windows and Mac OS X, menu or button shortcuts for menu or button commands.
commands are supported; on GTK, only menu commands are supported.
The object ::wxNullAcceleratorTable is defined to be a table with no data, and The object ::wxNullAcceleratorTable is defined to be a table with no data, and
is the initial accelerator table for a window. is the initial accelerator table for a window.

14
src/gtk/window.cpp
View File

@@ -869,8 +869,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->HandleWindowEvent( command_event ); ret = ancestor->HandleWindowEvent( 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->HandleWindowEvent( button_event );
}
break; break;
} }
if (ancestor->IsTopLevel()) if (ancestor->IsTopLevel())