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

added support for non alphanumeric simple character accelerators

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-09 12:23:11 +00:00
parent f9bd2c1bdf
commit a070d8ce24
4 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -140,6 +140,7 @@ wxGTK:
- wxDirDialog now presents the file system in standard Unix way
- wxButton now honours wxBU_EXACTFIT
- wxStaticBox now honours wxALIGN_XXX styles
- added support for non alphanumeric simple character accelerators ('-', '=')
wxHTML:

20
src/common/menucmn.cpp
View File

@@ -82,11 +82,25 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
else if ( current == _("shift") )
accelFlags |= wxACCEL_SHIFT;
else {
wxLogDebug(wxT("Unknown accel modifier: '%s'"),
current.c_str());
// we may have "Ctrl-+", for example, but we still want to
// catch typos like "Crtl-A" so only give the warning if we
// have something before the current '+' or '-', else take
// it as a literal symbol
if ( current.empty() )
{
current += label[n];
// skip clearing it below
continue;
}
else
{
wxLogDebug(wxT("Unknown accel modifier: '%s'"),
current.c_str());
}
}
current.Empty();
current.clear();
}
else {
current += wxTolower(label[n]);

21
src/gtk/menu.cpp
View File

@@ -1145,6 +1145,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
// ----------------------------------------------------------------------------
#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
static wxString GetHotKey( const wxMenuItem& item )
{
wxString hotkey;
@@ -1178,7 +1179,9 @@ static wxString GetHotKey( const wxMenuItem& item )
hotkey << wxT('F') << code - WXK_F1 + 1;
break;
// GTK seems to use XStringToKeySym here
// TODO: we should use gdk_keyval_name() (a.k.a.
// XKeysymToString) here as well as hardcoding the keysym
// names this might be not portable
case WXK_NUMPAD_INSERT:
hotkey << wxT("KP_Insert" );
break;
@@ -1192,15 +1195,18 @@ static wxString GetHotKey( const wxMenuItem& item )
hotkey << wxT("Delete" );
break;
// if there are any other keys wxGetAccelFromString() may return,
// we should process them here
// if there are any other keys wxGetAccelFromString() may
// return, we should process them here
default:
if ( wxIsalnum(code) )
if ( code < 127 )
{
hotkey << (wxChar)code;
break;
gchar *name = gdk_keyval_name((guint)code);
if ( name )
{
hotkey << name;
break;
}
}
wxFAIL_MSG( wxT("unknown keyboard accel") );
@@ -1211,6 +1217,7 @@ static wxString GetHotKey( const wxMenuItem& item )
return hotkey;
}
#endif // wxUSE_ACCEL

21
src/gtk1/menu.cpp
View File

@@ -1145,6 +1145,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
// ----------------------------------------------------------------------------
#if (GTK_MINOR_VERSION > 0) && wxUSE_ACCEL
static wxString GetHotKey( const wxMenuItem& item )
{
wxString hotkey;
@@ -1178,7 +1179,9 @@ static wxString GetHotKey( const wxMenuItem& item )
hotkey << wxT('F') << code - WXK_F1 + 1;
break;
// GTK seems to use XStringToKeySym here
// TODO: we should use gdk_keyval_name() (a.k.a.
// XKeysymToString) here as well as hardcoding the keysym
// names this might be not portable
case WXK_NUMPAD_INSERT:
hotkey << wxT("KP_Insert" );
break;
@@ -1192,15 +1195,18 @@ static wxString GetHotKey( const wxMenuItem& item )
hotkey << wxT("Delete" );
break;
// if there are any other keys wxGetAccelFromString() may return,
// we should process them here
// if there are any other keys wxGetAccelFromString() may
// return, we should process them here
default:
if ( wxIsalnum(code) )
if ( code < 127 )
{
hotkey << (wxChar)code;
break;
gchar *name = gdk_keyval_name((guint)code);
if ( name )
{
hotkey << name;
break;
}
}
wxFAIL_MSG( wxT("unknown keyboard accel") );
@@ -1211,6 +1217,7 @@ static wxString GetHotKey( const wxMenuItem& item )
return hotkey;
}
#endif // wxUSE_ACCEL