From e256956d12cbb550c100d013fe0ae2579f7472e4 Mon Sep 17 00:00:00 2001 From: Daniel Richard G Date: Mon, 26 Aug 2013 17:00:02 -0400 Subject: [PATCH] Added missing items to GraphicsWindow::menu[] elements Several MenuEntry elements in GraphicsWindow::menu[] were being initialized with four items instead of the requisite five, due to a missing fourth column (corresponding to the .accel field of MenuEntry). This change simply adds zeroes as the missing column to the appropriate elements. --- graphicswin.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/graphicswin.cpp b/graphicswin.cpp index f9052376..f8279fd5 100644 --- a/graphicswin.cpp +++ b/graphicswin.cpp @@ -19,7 +19,7 @@ #define C 0x200 #define F(k) (0xf0+(k)) const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = { -{ 0, "&File", 0, NULL }, +{ 0, "&File", 0, 0, NULL }, { 1, "&New\tCtrl+N", MNU_NEW, 'N'|C, mFile }, { 1, "&Open...\tCtrl+O", MNU_OPEN, 'O'|C, mFile }, {10, "Open &Recent", MNU_OPEN_RECENT, 0, mFile }, @@ -35,47 +35,47 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = { { 1, NULL, 0, 0, NULL }, { 1, "E&xit", MNU_EXIT, 0, mFile }, -{ 0, "&Edit", 0, NULL }, +{ 0, "&Edit", 0, 0, NULL }, { 1, "&Undo\tCtrl+Z", MNU_UNDO, 'Z'|C, mEdit }, { 1, "&Redo\tCtrl+Y", MNU_REDO, 'Y'|C, mEdit }, { 1, "Re&generate All\tSpace", MNU_REGEN_ALL, ' ', mEdit }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Snap Selection to &Grid\t.", MNU_SNAP_TO_GRID, '.', mEdit }, { 1, "Rotate Imported &90°\t9", MNU_ROTATE_90, '9', mEdit }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Cu&t\tCtrl+X", MNU_CUT, 'X'|C, mClip }, { 1, "&Copy\tCtrl+C", MNU_COPY, 'C'|C, mClip }, { 1, "&Paste\tCtrl+V", MNU_PASTE, 'V'|C, mClip }, { 1, "Paste &Transformed...\tCtrl+T", MNU_PASTE_TRANSFORM,'T'|C, mClip }, { 1, "&Delete\tDel", MNU_DELETE, 127, mClip }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Select &Edge Chain\tCtrl+E", MNU_SELECT_CHAIN, 'E'|C, mEdit }, { 1, "Select &All\tCtrl+A", MNU_SELECT_ALL, 'A'|C, mEdit }, { 1, "&Unselect All\tEsc", MNU_UNSELECT_ALL, 27, mEdit }, -{ 0, "&View", 0, NULL }, +{ 0, "&View", 0, 0, NULL }, { 1, "Zoom &In\t+", MNU_ZOOM_IN, '+', mView }, { 1, "Zoom &Out\t-", MNU_ZOOM_OUT, '-', mView }, { 1, "Zoom To &Fit\tF", MNU_ZOOM_TO_FIT, 'F', mView }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Align View to &Workplane\tW", MNU_ONTO_WORKPLANE, 'W', mView }, { 1, "Nearest &Ortho View\tF2", MNU_NEAREST_ORTHO, F(2), mView }, { 1, "Nearest &Isometric View\tF3", MNU_NEAREST_ISO, F(3), mView }, { 1, "&Center View At Point\tF4", MNU_CENTER_VIEW, F(4), mView }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Show Snap &Grid\t>", MNU_SHOW_GRID, '.'|S, mView }, { 1, "Use &Perspective Projection\t`", MNU_PERSPECTIVE_PROJ,'`', mView }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Show Text &Window\tTab", MNU_SHOW_TEXT_WND, '\t', mView }, { 1, "Show &Toolbar", MNU_SHOW_TOOLBAR, 0, mView }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Dimensions in &Inches", MNU_UNITS_INCHES, 0, mView }, { 1, "Dimensions in &Millimeters", MNU_UNITS_MM, 0, mView }, { 0, "&New Group", 0, 0, NULL }, { 1, "Sketch In &3d\tShift+3", MNU_GROUP_3D, '3'|S, mGrp }, { 1, "Sketch In New &Workplane\tShift+W", MNU_GROUP_WRKPL, 'W'|S, mGrp }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Step &Translating\tShift+T", MNU_GROUP_TRANS, 'T'|S, mGrp }, { 1, "Step &Rotating\tShift+R", MNU_GROUP_ROT, 'R'|S, mGrp }, { 1, NULL, 0, 0, NULL }, @@ -85,34 +85,34 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = { { 1, "Import / Assemble...\tShift+I", MNU_GROUP_IMPORT, 'I'|S, mGrp }, {11, "Import Recent", MNU_GROUP_RECENT, 0, mGrp }, -{ 0, "&Sketch", 0, NULL }, +{ 0, "&Sketch", 0, 0, NULL }, { 1, "In &Workplane\t2", MNU_SEL_WORKPLANE, '2', mReq }, { 1, "Anywhere In &3d\t3", MNU_FREE_IN_3D, '3', mReq }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Datum &Point\tP", MNU_DATUM_POINT, 'P', mReq }, { 1, "&Workplane", MNU_WORKPLANE, 0, mReq }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Line &Segment\tS", MNU_LINE_SEGMENT, 'S', mReq }, { 1, "&Rectangle\tR", MNU_RECTANGLE, 'R', mReq }, { 1, "&Circle\tC", MNU_CIRCLE, 'C', mReq }, { 1, "&Arc of a Circle\tA", MNU_ARC, 'A', mReq }, { 1, "&Bezier Cubic Spline\tB", MNU_CUBIC, 'B', mReq }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "&Text in TrueType Font\tT", MNU_TTF_TEXT, 'T', mReq }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "To&ggle Construction\tG", MNU_CONSTRUCTION, 'G', mReq }, { 1, "Tangent &Arc at Point\tShift+A", MNU_TANGENT_ARC, 'A'|S, mReq }, { 1, "Split Curves at &Intersection\tI", MNU_SPLIT_CURVES, 'I', mReq }, -{ 0, "&Constrain", 0, NULL }, +{ 0, "&Constrain", 0, 0, NULL }, { 1, "&Distance / Diameter\tD", MNU_DISTANCE_DIA, 'D', mCon }, { 1, "A&ngle\tN", MNU_ANGLE, 'N', mCon }, { 1, "Other S&upplementary Angle\tU", MNU_OTHER_ANGLE, 'U', mCon }, { 1, "Toggle R&eference Dim\tE", MNU_REFERENCE, 'E', mCon }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "&Horizontal\tH", MNU_HORIZONTAL, 'H', mCon }, { 1, "&Vertical\tV", MNU_VERTICAL, 'V', mCon }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "&On Point / Curve / Plane\tO", MNU_ON_ENTITY, 'O', mCon }, { 1, "E&qual Length / Radius / Angle\tQ", MNU_EQUAL, 'Q', mCon }, { 1, "Length Ra&tio\tZ", MNU_RATIO, 'Z', mCon }, @@ -122,17 +122,17 @@ const GraphicsWindow::MenuEntry GraphicsWindow::menu[] = { { 1, "&Perpendicular\t[", MNU_PERPENDICULAR, '[', mCon }, { 1, "Same Orient&ation\tX", MNU_ORIENTED_SAME, 'X', mCon }, { 1, "Lock Point Where &Dragged\t]", MNU_WHERE_DRAGGED, ']', mCon }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Comment\t;", MNU_COMMENT, ';', mCon }, -{ 0, "&Analyze", 0, NULL }, +{ 0, "&Analyze", 0, 0, NULL }, { 1, "Measure &Volume\tCtrl+Shift+V", MNU_VOLUME, 'V'|S|C,mAna }, { 1, "Measure &Area\tCtrl+Shift+A", MNU_AREA, 'A'|S|C,mAna }, { 1, "Show &Interfering Parts\tCtrl+Shift+I", MNU_INTERFERENCE, 'I'|S|C,mAna }, { 1, "Show &Naked Edges\tCtrl+Shift+N", MNU_NAKED_EDGES, 'N'|S|C,mAna }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "Show Degrees of &Freedom\tCtrl+Shift+F", MNU_SHOW_DOF, 'F'|S|C,mAna }, -{ 1, NULL, 0, NULL }, +{ 1, NULL, 0, 0, NULL }, { 1, "&Trace Point\tCtrl+Shift+T", MNU_TRACE_PT, 'T'|S|C,mAna }, { 1, "&Stop Tracing...\tCtrl+Shift+S", MNU_STOP_TRACING, 'S'|S|C,mAna }, { 1, "Step &Dimension...\tCtrl+Shift+D", MNU_STEP_DIM, 'D'|S|C,mAna },