X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fgraph3dview.cpp;h=a391599a8012089e0cb04627db8cffb70d3942c2;hp=71ae71b77e79471b421d4b49874278fed0344bbc;hb=50fd2b2fb2ff63871986e6853dbebad0ecd00698;hpb=3b389ec4d6e6c5a720ea096b8f504e02b984d237 diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 71ae71b..a391599 100644 --- a/src/graph3dview.cpp +++ b/src/graph3dview.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: graph3dview.cpp,v 1.12 2001/02/08 22:38:23 kevin Exp $ +** $Id: graph3dview.cpp,v 1.13 2001/02/16 02:36:18 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -772,7 +772,6 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) wxMenu *help_menu = new wxMenu; help_menu->Append(MAINMENU_HELP_CONTENTS, "&Contents\tF1"); - help_menu->Append(MAINMENU_HELP_TOPICS, "&Topics\tCtrl-H"); help_menu->Append(MAINMENU_HELP_ABOUT, "&About"); wxMenuBar *menu_bar = new wxMenuBar; @@ -784,23 +783,18 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) subframe->SetMenuBar(menu_bar); subframe->Centre(wxBOTH); - - wxAcceleratorEntry accelEntries[12]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('O'), wxID_OPEN); - accelEntries[1].Set (wxACCEL_CTRL, static_cast('H'), MAINMENU_HELP_TOPICS); - accelEntries[2].Set (wxACCEL_CTRL, static_cast('P'), MAINMENU_FILE_CREATE_PHANTOM); - accelEntries[3].Set (wxACCEL_CTRL, static_cast('F'), MAINMENU_FILE_CREATE_FILTER); - accelEntries[4].Set (wxACCEL_NORMAL, WXK_F1, MAINMENU_HELP_CONTENTS); - accelEntries[5].Set (wxACCEL_CTRL, static_cast('R'), GRAPH3D_VIEW_SURFACE); - accelEntries[6].Set (wxACCEL_CTRL, static_cast('L'), GRAPH3D_VIEW_COLOR); - accelEntries[7].Set (wxACCEL_CTRL, static_cast('G'), GRAPH3D_VIEW_LIGHTING); - accelEntries[8].Set (wxACCEL_CTRL, static_cast('M'), GRAPH3D_VIEW_SMOOTH); - accelEntries[9].Set (wxACCEL_CTRL, static_cast('E'), GRAPH3D_VIEW_SCALE_MINMAX); - accelEntries[10].Set (wxACCEL_CTRL, static_cast('A'), GRAPH3D_VIEW_SCALE_AUTO); - accelEntries[11].Set (wxACCEL_CTRL, static_cast('U'), GRAPH3D_VIEW_SCALE_FULL); - wxAcceleratorTable accelTable (12, accelEntries); + + wxAcceleratorEntry accelEntries[7]; + accelEntries[0].Set (wxACCEL_CTRL, static_cast('R'), GRAPH3D_VIEW_SURFACE); + accelEntries[1].Set (wxACCEL_CTRL, static_cast('L'), GRAPH3D_VIEW_COLOR); + accelEntries[2].Set (wxACCEL_CTRL, static_cast('G'), GRAPH3D_VIEW_LIGHTING); + accelEntries[3].Set (wxACCEL_CTRL, static_cast('M'), GRAPH3D_VIEW_SMOOTH); + accelEntries[4].Set (wxACCEL_CTRL, static_cast('E'), GRAPH3D_VIEW_SCALE_MINMAX); + accelEntries[5].Set (wxACCEL_CTRL, static_cast('A'), GRAPH3D_VIEW_SCALE_AUTO); + accelEntries[6].Set (wxACCEL_CTRL, static_cast('U'), GRAPH3D_VIEW_SCALE_FULL); + wxAcceleratorTable accelTable (7, accelEntries); subframe->SetAcceleratorTable (accelTable); - + return subframe; }