From 10d28c972b8108f1eb2efa07e22738469972b5e8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Feb 2013 20:46:13 +0000 Subject: [PATCH] Use a single EVT_MENU_RANGE in stc sample instead of tons of EVT_MENU. Make it easier to add new menu items forwarded to the editor in the sample. No real changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/stc/defsext.h | 4 +++- samples/stc/stctest.cpp | 30 +++--------------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h index 8999339..d554b03 100644 --- a/samples/stc/defsext.h +++ b/samples/stc/defsext.h @@ -40,7 +40,8 @@ enum { // menu IDs myID_PROPERTIES = wxID_HIGHEST, - myID_INDENTINC, + myID_EDIT_FIRST, + myID_INDENTINC = myID_EDIT_FIRST, myID_INDENTRED, myID_FINDNEXT, myID_REPLACE, @@ -73,6 +74,7 @@ enum { myID_PAGEPREV, myID_PAGENEXT, myID_SELECTLINE, + myID_EDIT_LAST = myID_SELECTLINE, myID_WINDOW_MINIMAL, // other IDs diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 599722d..a662f07 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -263,7 +263,7 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) EVT_MENU (wxID_PREVIEW, AppFrame::OnPrintPreview) EVT_MENU (wxID_PRINT, AppFrame::OnPrint) EVT_MENU (wxID_EXIT, AppFrame::OnExit) - // edit + // Menu items with standard IDs forwarded to the editor. EVT_MENU (wxID_CLEAR, AppFrame::OnEdit) EVT_MENU (wxID_CUT, AppFrame::OnEdit) EVT_MENU (wxID_COPY, AppFrame::OnEdit) @@ -271,36 +271,12 @@ BEGIN_EVENT_TABLE (AppFrame, wxFrame) EVT_MENU (myID_INDENTINC, AppFrame::OnEdit) EVT_MENU (myID_INDENTRED, AppFrame::OnEdit) EVT_MENU (wxID_SELECTALL, AppFrame::OnEdit) - EVT_MENU (myID_SELECTLINE, AppFrame::OnEdit) EVT_MENU (wxID_REDO, AppFrame::OnEdit) EVT_MENU (wxID_UNDO, AppFrame::OnEdit) - // find EVT_MENU (wxID_FIND, AppFrame::OnEdit) - EVT_MENU (myID_FINDNEXT, AppFrame::OnEdit) - EVT_MENU (myID_REPLACE, AppFrame::OnEdit) - EVT_MENU (myID_REPLACENEXT, AppFrame::OnEdit) - EVT_MENU (myID_BRACEMATCH, AppFrame::OnEdit) - EVT_MENU (myID_GOTO, AppFrame::OnEdit) - // view - EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST, + // And all our edit-related menu commands. + EVT_MENU_RANGE (myID_EDIT_FIRST, myID_EDIT_LAST, AppFrame::OnEdit) - EVT_MENU (myID_DISPLAYEOL, AppFrame::OnEdit) - EVT_MENU (myID_INDENTGUIDE, AppFrame::OnEdit) - EVT_MENU (myID_LINENUMBER, AppFrame::OnEdit) - EVT_MENU (myID_LONGLINEON, AppFrame::OnEdit) - EVT_MENU (myID_WHITESPACE, AppFrame::OnEdit) - EVT_MENU (myID_FOLDTOGGLE, AppFrame::OnEdit) - EVT_MENU (myID_OVERTYPE, AppFrame::OnEdit) - EVT_MENU (myID_READONLY, AppFrame::OnEdit) - EVT_MENU (myID_WRAPMODEON, AppFrame::OnEdit) - // extra - EVT_MENU (myID_CHANGELOWER, AppFrame::OnEdit) - EVT_MENU (myID_CHANGEUPPER, AppFrame::OnEdit) - EVT_MENU (myID_CONVERTCR, AppFrame::OnEdit) - EVT_MENU (myID_CONVERTCRLF, AppFrame::OnEdit) - EVT_MENU (myID_CONVERTLF, AppFrame::OnEdit) - EVT_MENU (myID_CHARSETANSI, AppFrame::OnEdit) - EVT_MENU (myID_CHARSETMAC, AppFrame::OnEdit) // help EVT_MENU (wxID_ABOUT, AppFrame::OnAbout) END_EVENT_TABLE () -- 2.7.4