AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adapting to new ctrl constant handling on OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2011-08-16 13:46:56 +00:00
parent 3bc6d53403
commit 675ec6655e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/cmdproc.cpp
View File

@ -62,8 +62,8 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands)
#endif // wxUSE_MENUS
#if wxUSE_ACCEL
m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CMD, 'Z').ToString();
m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CMD, 'Y').ToString();
m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Z').ToString();
m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Y').ToString();
#endif // wxUSE_ACCEL
m_lastSavedCommand =

22
src/common/stockitem.cpp
View File

@ -281,17 +281,17 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
switch (id)
{
STOCKITEM(wxID_COPY, wxACCEL_CMD,'C')
STOCKITEM(wxID_CUT, wxACCEL_CMD,'X')
STOCKITEM(wxID_FIND, wxACCEL_CMD,'F')
STOCKITEM(wxID_HELP, wxACCEL_CMD,'H')
STOCKITEM(wxID_NEW, wxACCEL_CMD,'N')
STOCKITEM(wxID_OPEN, wxACCEL_CMD,'O')
STOCKITEM(wxID_PASTE, wxACCEL_CMD,'V')
STOCKITEM(wxID_REDO, wxACCEL_CMD | wxACCEL_SHIFT,'Z')
STOCKITEM(wxID_REPLACE, wxACCEL_CMD,'R')
STOCKITEM(wxID_SAVE, wxACCEL_CMD,'S')
STOCKITEM(wxID_UNDO, wxACCEL_CMD,'Z')
STOCKITEM(wxID_COPY, wxACCEL_CTRL,'C')
STOCKITEM(wxID_CUT, wxACCEL_CTRL,'X')
STOCKITEM(wxID_FIND, wxACCEL_CTRL,'F')
STOCKITEM(wxID_HELP, wxACCEL_CTRL,'H')
STOCKITEM(wxID_NEW, wxACCEL_CTRL,'N')
STOCKITEM(wxID_OPEN, wxACCEL_CTRL,'O')
STOCKITEM(wxID_PASTE, wxACCEL_CTRL,'V')
STOCKITEM(wxID_REDO, wxACCEL_CTRL | wxACCEL_SHIFT,'Z')
STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'R')
STOCKITEM(wxID_SAVE, wxACCEL_CTRL,'S')
STOCKITEM(wxID_UNDO, wxACCEL_CTRL,'Z')
default:
// set the wxAcceleratorEntry to return into an invalid state:

12
src/richtext/richtextctrl.cpp
View File

@ -293,12 +293,12 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
// Accelerators
wxAcceleratorEntry entries[6];
entries[0].Set(wxACCEL_CMD, (int) 'C', wxID_COPY);
entries[1].Set(wxACCEL_CMD, (int) 'X', wxID_CUT);
entries[2].Set(wxACCEL_CMD, (int) 'V', wxID_PASTE);
entries[3].Set(wxACCEL_CMD, (int) 'A', wxID_SELECTALL);
entries[4].Set(wxACCEL_CMD, (int) 'Z', wxID_UNDO);
entries[5].Set(wxACCEL_CMD, (int) 'Y', wxID_REDO);
entries[0].Set(wxACCEL_CTRL, (int) 'C', wxID_COPY);
entries[1].Set(wxACCEL_CTRL, (int) 'X', wxID_CUT);
entries[2].Set(wxACCEL_CTRL, (int) 'V', wxID_PASTE);
entries[3].Set(wxACCEL_CTRL, (int) 'A', wxID_SELECTALL);
entries[4].Set(wxACCEL_CTRL, (int) 'Z', wxID_UNDO);
entries[5].Set(wxACCEL_CTRL, (int) 'Y', wxID_REDO);
wxAcceleratorTable accel(6, entries);
SetAcceleratorTable(accel);