diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:22:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:33:30 +0300 |
| commit | 30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch) | |
| tree | ab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /vcl/source/control/edit.cxx | |
| parent | 02f6c270e79879188b2be670c6db4feb56bb064e (diff) | |
fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.
Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
Diffstat (limited to 'vcl/source/control/edit.cxx')
| -rw-r--r-- | vcl/source/control/edit.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index e886e0f6dbfc..ac5c57b7bdd2 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2833,13 +2833,13 @@ PopupMenu* Edit::CreatePopupMenu() pPopup->SetMenuFlags ( MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ); if ( rStyleSettings.GetAcceleratorsInContextMenus() ) { - pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, KeyCode( KEYFUNC_UNDO ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_CUT, KeyCode( KEYFUNC_CUT ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_COPY, KeyCode( KEYFUNC_COPY ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, KeyCode( KEYFUNC_PASTE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, KeyCode( KEYFUNC_DELETE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, false, true, false, false ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, true, true, false, false ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_UNDO, vcl::KeyCode( KEYFUNC_UNDO ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_CUT, vcl::KeyCode( KEYFUNC_CUT ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_COPY, vcl::KeyCode( KEYFUNC_COPY ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, vcl::KeyCode( KEYFUNC_PASTE ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, vcl::KeyCode( KEYFUNC_DELETE ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, vcl::KeyCode( KEY_A, false, true, false, false ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, vcl::KeyCode( KEY_S, true, true, false, false ) ); } return pPopup; } |