Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 5025) +++ trunk/doc-rnd/hacking/renames (revision 5026) @@ -903,3 +903,25 @@ get_increments_struct -> pcb_get_increments_struct NormalizeAngle -> pcb_normalize_angle initialize_units -> pcb_units_init +UNDO_CHANGENAME -> PCB_UNDO_CHANGENAME +UNDO_MOVE -> PCB_UNDO_MOVE +UNDO_REMOVE -> PCB_UNDO_REMOVE +UNDO_REMOVE_POINT -> PCB_UNDO_REMOVE_POINT +UNDO_INSERT_POINT -> PCB_UNDO_INSERT_POINT +UNDO_REMOVE_CONTOUR -> PCB_UNDO_REMOVE_CONTOUR +UNDO_INSERT_CONTOUR -> PCB_UNDO_INSERT_CONTOUR +UNDO_ROTATE -> PCB_UNDO_ROTATE +UNDO_CREATE -> PCB_UNDO_CREATE +UNDO_MOVETOLAYER -> PCB_UNDO_MOVETOLAYER +UNDO_FLAG -> PCB_UNDO_FLAG +UNDO_CHANGESIZE -> PCB_UNDO_CHANGESIZE +UNDO_CHANGE2NDSIZE -> PCB_UNDO_CHANGE2NDSIZE +UNDO_MIRROR -> PCB_UNDO_MIRROR +UNDO_CHANGECLEARSIZE -> PCB_UNDO_CHANGECLEARSIZE +UNDO_CHANGEMASKSIZE -> PCB_UNDO_CHANGEMASKSIZE +UNDO_CHANGEANGLES -> PCB_UNDO_CHANGEANGLES +UNDO_LAYERCHANGE -> PCB_UNDO_LAYERCHANGE +UNDO_CLEAR -> PCB_UNDO_CLEAR +UNDO_NETLISTCHANGE -> PCB_UNDO_NETLISTCHANGE +UNDO_CHANGEPINNUM -> PCB_UNDO_CHANGEPINNUM +UNDO_CHANGERADII -> PCB_UNDO_CHANGERADII Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 5025) +++ trunk/src/undo.c (revision 5026) @@ -213,11 +213,11 @@ for (ptr = &UndoList[UndoN]; RedoN; ptr++, RedoN--) switch (ptr->Type) { - case UNDO_CHANGENAME: - case UNDO_CHANGEPINNUM: + case PCB_UNDO_CHANGENAME: + case PCB_UNDO_CHANGEPINNUM: free(ptr->Data.ChangeName.Name); break; - case UNDO_REMOVE: + case PCB_UNDO_REMOVE: type = pcb_search_obj_by_id(RemoveList, &ptr1, &ptr2, &ptr3, ptr->ID, ptr->Kind); if (type != PCB_TYPE_NONE) { pcb_destroy_object(RemoveList, type, ptr1, ptr2, ptr3); @@ -591,7 +591,7 @@ pcb_erase_obj(type, ptr1, ptr2); /* in order to make this re-doable we move it to the RemoveList */ pcb_move_obj_to_buffer(RemoveList, PCB->Data, type, ptr1, ptr2, ptr3); - Entry->Type = UNDO_REMOVE; + Entry->Type = PCB_UNDO_REMOVE; return (pcb_true); } return (pcb_false); @@ -632,7 +632,7 @@ if (andDraw) DrawRecoveredObject(type, ptr1, ptr2, ptr3); pcb_move_obj_to_buffer(PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); - Entry->Type = UNDO_CREATE; + Entry->Type = PCB_UNDO_CREATE; return (pcb_true); } return (pcb_false); @@ -686,7 +686,7 @@ polygon->Points[Entry->Data.RemovedPoint.Index].ID = Entry->Data.RemovedPoint.ID; if (andDraw && layer->On) DrawPolygon(layer, polygon); - Entry->Type = UNDO_INSERT_POINT; + Entry->Type = PCB_UNDO_INSERT_POINT; Entry->ID = Entry->Data.RemovedPoint.ID; Entry->Kind = PCB_TYPE_POLYGON_POINT; return (pcb_true); @@ -737,7 +737,7 @@ Entry->Data.RemovedPoint.ID = pnt->ID; Entry->ID = polygon->ID; Entry->Kind = PCB_TYPE_POLYGON; - Entry->Type = UNDO_REMOVE_POINT; + Entry->Type = PCB_UNDO_REMOVE_POINT; Entry->Data.RemovedPoint.Index = point_idx; pcb_destroy_object(PCB->Data, PCB_TYPE_POLYGON_POINT, layer, polygon, pnt); if (andDraw && layer->On) @@ -935,114 +935,114 @@ static int PerformUndo(UndoListTypePtr ptr) { switch (ptr->Type) { - case UNDO_CHANGENAME: + case PCB_UNDO_CHANGENAME: if (UndoChangeName(ptr)) - return (UNDO_CHANGENAME); + return (PCB_UNDO_CHANGENAME); break; - case UNDO_CHANGEPINNUM: + case PCB_UNDO_CHANGEPINNUM: if (UndoChangePinnum(ptr)) - return (UNDO_CHANGEPINNUM); + return (PCB_UNDO_CHANGEPINNUM); break; - case UNDO_CREATE: + case PCB_UNDO_CREATE: if (UndoCopyOrCreate(ptr)) - return (UNDO_CREATE); + return (PCB_UNDO_CREATE); break; - case UNDO_MOVE: + case PCB_UNDO_MOVE: if (UndoMove(ptr)) - return (UNDO_MOVE); + return (PCB_UNDO_MOVE); break; - case UNDO_REMOVE: + case PCB_UNDO_REMOVE: if (UndoRemove(ptr)) - return (UNDO_REMOVE); + return (PCB_UNDO_REMOVE); break; - case UNDO_REMOVE_POINT: + case PCB_UNDO_REMOVE_POINT: if (UndoRemovePoint(ptr)) - return (UNDO_REMOVE_POINT); + return (PCB_UNDO_REMOVE_POINT); break; - case UNDO_INSERT_POINT: + case PCB_UNDO_INSERT_POINT: if (UndoInsertPoint(ptr)) - return (UNDO_INSERT_POINT); + return (PCB_UNDO_INSERT_POINT); break; - case UNDO_REMOVE_CONTOUR: + case PCB_UNDO_REMOVE_CONTOUR: if (UndoRemoveContour(ptr)) - return (UNDO_REMOVE_CONTOUR); + return (PCB_UNDO_REMOVE_CONTOUR); break; - case UNDO_INSERT_CONTOUR: + case PCB_UNDO_INSERT_CONTOUR: if (UndoInsertContour(ptr)) - return (UNDO_INSERT_CONTOUR); + return (PCB_UNDO_INSERT_CONTOUR); break; - case UNDO_ROTATE: + case PCB_UNDO_ROTATE: if (UndoRotate(ptr)) - return (UNDO_ROTATE); + return (PCB_UNDO_ROTATE); break; - case UNDO_CLEAR: + case PCB_UNDO_CLEAR: if (UndoClearPoly(ptr)) - return (UNDO_CLEAR); + return (PCB_UNDO_CLEAR); break; - case UNDO_MOVETOLAYER: + case PCB_UNDO_MOVETOLAYER: if (UndoMoveToLayer(ptr)) - return (UNDO_MOVETOLAYER); + return (PCB_UNDO_MOVETOLAYER); break; - case UNDO_FLAG: + case PCB_UNDO_FLAG: if (UndoFlag(ptr)) - return (UNDO_FLAG); + return (PCB_UNDO_FLAG); break; - case UNDO_CHANGESIZE: + case PCB_UNDO_CHANGESIZE: if (UndoChangeSize(ptr)) - return (UNDO_CHANGESIZE); + return (PCB_UNDO_CHANGESIZE); break; - case UNDO_CHANGECLEARSIZE: + case PCB_UNDO_CHANGECLEARSIZE: if (UndoChangeClearSize(ptr)) - return (UNDO_CHANGECLEARSIZE); + return (PCB_UNDO_CHANGECLEARSIZE); break; - case UNDO_CHANGEMASKSIZE: + case PCB_UNDO_CHANGEMASKSIZE: if (UndoChangeMaskSize(ptr)) - return (UNDO_CHANGEMASKSIZE); + return (PCB_UNDO_CHANGEMASKSIZE); break; - case UNDO_CHANGE2NDSIZE: + case PCB_UNDO_CHANGE2NDSIZE: if (UndoChange2ndSize(ptr)) - return (UNDO_CHANGE2NDSIZE); + return (PCB_UNDO_CHANGE2NDSIZE); break; - case UNDO_CHANGEANGLES: + case PCB_UNDO_CHANGEANGLES: if (UndoChangeAngles(ptr)) - return (UNDO_CHANGEANGLES); + return (PCB_UNDO_CHANGEANGLES); break; - case UNDO_CHANGERADII: + case PCB_UNDO_CHANGERADII: if (UndoChangeRadii(ptr)) - return (UNDO_CHANGERADII); + return (PCB_UNDO_CHANGERADII); break; - case UNDO_LAYERCHANGE: + case PCB_UNDO_LAYERCHANGE: if (UndoLayerChange(ptr)) - return (UNDO_LAYERCHANGE); + return (PCB_UNDO_LAYERCHANGE); break; - case UNDO_NETLISTCHANGE: + case PCB_UNDO_NETLISTCHANGE: if (UndoNetlistChange(ptr)) - return (UNDO_NETLISTCHANGE); + return (PCB_UNDO_NETLISTCHANGE); break; - case UNDO_MIRROR: + case PCB_UNDO_MIRROR: if (UndoMirror(ptr)) - return (UNDO_MIRROR); + return (PCB_UNDO_MIRROR); break; } return 0; @@ -1157,7 +1157,7 @@ if (UndoN && (Force || gui->confirm_dialog("OK to clear 'undo' buffer?", 0))) { /* release memory allocated by objects in undo list */ for (undo = UndoList; UndoN; undo++, UndoN--) { - if ((undo->Type == UNDO_CHANGENAME) || (undo->Type == UNDO_CHANGEPINNUM)) + if ((undo->Type == PCB_UNDO_CHANGENAME) || (undo->Type == PCB_UNDO_CHANGEPINNUM)) free(undo->Data.ChangeName.Name); } free(UndoList); @@ -1184,7 +1184,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CLEAR, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_CLEAR, PCB_OBJECT_ID(Ptr3), Type); undo->Data.ClearPoly.Clear = clear; undo->Data.ClearPoly.Layer = (pcb_layer_t *) Ptr1; } @@ -1198,7 +1198,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_MIRROR, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_MIRROR, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Move.DY = yoff; } } @@ -1211,7 +1211,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_ROTATE, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_ROTATE, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Rotate.CenterX = CenterX; undo->Data.Rotate.CenterY = CenterY; undo->Data.Rotate.Steps = Steps; @@ -1230,7 +1230,7 @@ if (!RemoveList) RemoveList = pcb_buffer_new(); - GetUndoSlot(UNDO_REMOVE, PCB_OBJECT_ID(Ptr3), Type); + GetUndoSlot(PCB_UNDO_REMOVE, PCB_OBJECT_ID(Ptr3), Type); pcb_move_obj_to_buffer(RemoveList, PCB->Data, Type, Ptr1, Ptr2, Ptr3); } @@ -1251,7 +1251,7 @@ /* save the ID of the parent object; else it will be * impossible to recover the point */ - undo = GetUndoSlot(UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_TYPE_POLYGON); + undo = GetUndoSlot(PCB_UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_TYPE_POLYGON); undo->Data.RemovedPoint.X = polygon->Points[index].X; undo->Data.RemovedPoint.Y = polygon->Points[index].Y; undo->Data.RemovedPoint.ID = polygon->Points[index].ID; @@ -1279,7 +1279,7 @@ void pcb_undo_add_obj_to_insert_point(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (!Locked) - GetUndoSlot(UNDO_INSERT_POINT, PCB_OBJECT_ID(Ptr3), Type); + GetUndoSlot(PCB_UNDO_INSERT_POINT, PCB_OBJECT_ID(Ptr3), Type); } static void CopyObjectToUndoList(int undo_type, int Type, void *Ptr1, void *Ptr2, void *Ptr3) @@ -1304,7 +1304,7 @@ */ void pcb_undo_add_obj_to_remove_contour(int Type, pcb_layer_t * Layer, pcb_polygon_t * Polygon) { - CopyObjectToUndoList(UNDO_REMOVE_CONTOUR, Type, Layer, Polygon, NULL); + CopyObjectToUndoList(PCB_UNDO_REMOVE_CONTOUR, Type, Layer, Polygon, NULL); } /* --------------------------------------------------------------------------- @@ -1313,7 +1313,7 @@ */ void pcb_undo_add_obj_to_insert_contour(int Type, pcb_layer_t * Layer, pcb_polygon_t * Polygon) { - CopyObjectToUndoList(UNDO_INSERT_CONTOUR, Type, Layer, Polygon, NULL); + CopyObjectToUndoList(PCB_UNDO_INSERT_CONTOUR, Type, Layer, Polygon, NULL); } /* --------------------------------------------------------------------------- @@ -1324,7 +1324,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_MOVE, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_MOVE, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Move.DX = DX; undo->Data.Move.DY = DY; } @@ -1338,7 +1338,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGENAME, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGENAME, PCB_OBJECT_ID(Ptr3), Type); undo->Data.ChangeName.Name = OldName; } } @@ -1351,7 +1351,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGEPINNUM, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGEPINNUM, PCB_OBJECT_ID(Ptr3), Type); undo->Data.ChangeName.Name = OldName; } } @@ -1364,7 +1364,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_MOVETOLAYER, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_MOVETOLAYER, PCB_OBJECT_ID(Ptr3), Type); undo->Data.MoveToLayer.OriginalLayer = GetLayerNumber(PCB->Data, (pcb_layer_t *) Ptr1); } } @@ -1375,7 +1375,7 @@ void pcb_undo_add_obj_to_create(int Type, void *Ptr1, void *Ptr2, void *Ptr3) { if (!Locked) - GetUndoSlot(UNDO_CREATE, PCB_OBJECT_ID(Ptr3), Type); + GetUndoSlot(PCB_UNDO_CREATE, PCB_OBJECT_ID(Ptr3), Type); pcb_poly_clear_from_poly(PCB->Data, Type, Ptr1, Ptr2); } @@ -1387,7 +1387,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_FLAG, PCB_OBJECT_ID(Ptr2), Type); + undo = GetUndoSlot(PCB_UNDO_FLAG, PCB_OBJECT_ID(Ptr2), Type); undo->Data.Flags = ((pcb_pin_t *) Ptr2)->Flags; } } @@ -1400,7 +1400,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGESIZE, PCB_OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGESIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { case PCB_TYPE_PIN: case PCB_TYPE_VIA: @@ -1433,7 +1433,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGECLEARSIZE, PCB_OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGECLEARSIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { case PCB_TYPE_PIN: case PCB_TYPE_VIA: @@ -1460,7 +1460,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGEMASKSIZE, PCB_OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGEMASKSIZE, PCB_OBJECT_ID(ptr2), Type); switch (Type) { case PCB_TYPE_PIN: case PCB_TYPE_VIA: @@ -1481,7 +1481,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGE2NDSIZE, PCB_OBJECT_ID(ptr2), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGE2NDSIZE, PCB_OBJECT_ID(ptr2), Type); if (Type == PCB_TYPE_PIN || Type == PCB_TYPE_VIA) undo->Data.Size = ((pcb_pin_t *) ptr2)->DrillingHole; } @@ -1497,7 +1497,7 @@ pcb_arc_t *a = (pcb_arc_t *) Ptr3; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGEANGLES, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGEANGLES, PCB_OBJECT_ID(Ptr3), Type); undo->Data.AngleChange.angle[0] = a->StartAngle; undo->Data.AngleChange.angle[1] = a->Delta; } @@ -1513,7 +1513,7 @@ pcb_arc_t *a = (pcb_arc_t *) Ptr3; if (!Locked) { - undo = GetUndoSlot(UNDO_CHANGERADII, PCB_OBJECT_ID(Ptr3), Type); + undo = GetUndoSlot(PCB_UNDO_CHANGERADII, PCB_OBJECT_ID(Ptr3), Type); undo->Data.Move.DX = a->Width; undo->Data.Move.DY = a->Height; } @@ -1527,7 +1527,7 @@ UndoListTypePtr undo; if (!Locked) { - undo = GetUndoSlot(UNDO_LAYERCHANGE, 0, 0); + undo = GetUndoSlot(PCB_UNDO_LAYERCHANGE, 0, 0); undo->Data.LayerChange.old_index = old_index; undo->Data.LayerChange.new_index = new_index; } @@ -1543,7 +1543,7 @@ pcb_lib_t *old; if (!Locked) { - undo = GetUndoSlot(UNDO_NETLISTCHANGE, 0, 0); + undo = GetUndoSlot(PCB_UNDO_NETLISTCHANGE, 0, 0); /* keep track of where the data needs to go */ undo->Data.NetlistChange.lib = lib; @@ -1625,28 +1625,28 @@ { static char buff[32]; switch(type) { - case UNDO_CHANGENAME: return "changename"; - case UNDO_MOVE: return "move"; - case UNDO_REMOVE: return "remove"; - case UNDO_REMOVE_POINT: return "remove_point"; - case UNDO_INSERT_POINT: return "insert_point"; - case UNDO_REMOVE_CONTOUR: return "remove_contour"; - case UNDO_INSERT_CONTOUR: return "insert_contour"; - case UNDO_ROTATE: return "rotate"; - case UNDO_CREATE: return "create"; - case UNDO_MOVETOLAYER: return "movetolayer"; - case UNDO_FLAG: return "flag"; - case UNDO_CHANGESIZE: return "changesize"; - case UNDO_CHANGE2NDSIZE: return "change2ndsize"; - case UNDO_MIRROR: return "mirror"; - case UNDO_CHANGECLEARSIZE: return "chngeclearsize"; - case UNDO_CHANGEMASKSIZE: return "changemasksize"; - case UNDO_CHANGEANGLES: return "changeangles"; - case UNDO_CHANGERADII: return "changeradii"; - case UNDO_LAYERCHANGE: return "layerchange"; - case UNDO_CLEAR: return "clear"; - case UNDO_NETLISTCHANGE: return "netlistchange"; - case UNDO_CHANGEPINNUM: return "changepinnum"; + case PCB_UNDO_CHANGENAME: return "changename"; + case PCB_UNDO_MOVE: return "move"; + case PCB_UNDO_REMOVE: return "remove"; + case PCB_UNDO_REMOVE_POINT: return "remove_point"; + case PCB_UNDO_INSERT_POINT: return "insert_point"; + case PCB_UNDO_REMOVE_CONTOUR: return "remove_contour"; + case PCB_UNDO_INSERT_CONTOUR: return "insert_contour"; + case PCB_UNDO_ROTATE: return "rotate"; + case PCB_UNDO_CREATE: return "create"; + case PCB_UNDO_MOVETOLAYER: return "movetolayer"; + case PCB_UNDO_FLAG: return "flag"; + case PCB_UNDO_CHANGESIZE: return "changesize"; + case PCB_UNDO_CHANGE2NDSIZE: return "change2ndsize"; + case PCB_UNDO_MIRROR: return "mirror"; + case PCB_UNDO_CHANGECLEARSIZE: return "chngeclearsize"; + case PCB_UNDO_CHANGEMASKSIZE: return "changemasksize"; + case PCB_UNDO_CHANGEANGLES: return "changeangles"; + case PCB_UNDO_CHANGERADII: return "changeradii"; + case PCB_UNDO_LAYERCHANGE: return "layerchange"; + case PCB_UNDO_CLEAR: return "clear"; + case PCB_UNDO_NETLISTCHANGE: return "netlistchange"; + case PCB_UNDO_CHANGEPINNUM: return "changepinnum"; } sprintf(buff, "Unknown %d", type); return buff; Index: trunk/src/undo.h =================================================================== --- trunk/src/undo.h (revision 5025) +++ trunk/src/undo.h (revision 5026) @@ -80,28 +80,28 @@ * note these must be separate bits now */ typedef enum { - UNDO_CHANGENAME = 0x000001, /* change of names */ - UNDO_MOVE = 0x000002, /* moving objects */ - UNDO_REMOVE = 0x000004, /* removing objects */ - UNDO_REMOVE_POINT = 0x000008, /* removing polygon/... points */ - UNDO_INSERT_POINT = 0x000010, /* inserting polygon/... points */ - UNDO_REMOVE_CONTOUR = 0x000020, /* removing a contour from a polygon */ - UNDO_INSERT_CONTOUR = 0x000040, /* inserting a contour from a polygon */ - UNDO_ROTATE = 0x000080, /* rotations */ - UNDO_CREATE = 0x000100, /* creation of objects */ - UNDO_MOVETOLAYER = 0x000200, /* moving objects to */ - UNDO_FLAG = 0x000400, /* toggling SELECTED flag */ - UNDO_CHANGESIZE = 0x000800, /* change size of object */ - UNDO_CHANGE2NDSIZE = 0x001000, /* change 2ndSize of object */ - UNDO_MIRROR = 0x002000, /* change side of board */ - UNDO_CHANGECLEARSIZE = 0x004000, /* change clearance size */ - UNDO_CHANGEMASKSIZE = 0x008000, /* change mask size */ - UNDO_CHANGEANGLES = 0x010000, /* change arc angles */ - UNDO_LAYERCHANGE = 0x020000, /* layer new/delete/move */ - UNDO_CLEAR = 0x040000, /* clear/restore to polygons */ - UNDO_NETLISTCHANGE = 0x080000, /* netlist change */ - UNDO_CHANGEPINNUM = 0x100000, /* change of pin number */ - UNDO_CHANGERADII = 0x200000 /* change arc radii */ + PCB_UNDO_CHANGENAME = 0x000001, /* change of names */ + PCB_UNDO_MOVE = 0x000002, /* moving objects */ + PCB_UNDO_REMOVE = 0x000004, /* removing objects */ + PCB_UNDO_REMOVE_POINT = 0x000008, /* removing polygon/... points */ + PCB_UNDO_INSERT_POINT = 0x000010, /* inserting polygon/... points */ + PCB_UNDO_REMOVE_CONTOUR = 0x000020, /* removing a contour from a polygon */ + PCB_UNDO_INSERT_CONTOUR = 0x000040, /* inserting a contour from a polygon */ + PCB_UNDO_ROTATE = 0x000080, /* rotations */ + PCB_UNDO_CREATE = 0x000100, /* creation of objects */ + PCB_UNDO_MOVETOLAYER = 0x000200, /* moving objects to */ + PCB_UNDO_FLAG = 0x000400, /* toggling SELECTED flag */ + PCB_UNDO_CHANGESIZE = 0x000800, /* change size of object */ + PCB_UNDO_CHANGE2NDSIZE = 0x001000, /* change 2ndSize of object */ + PCB_UNDO_MIRROR = 0x002000, /* change side of board */ + PCB_UNDO_CHANGECLEARSIZE = 0x004000, /* change clearance size */ + PCB_UNDO_CHANGEMASKSIZE = 0x008000, /* change mask size */ + PCB_UNDO_CHANGEANGLES = 0x010000, /* change arc angles */ + PCB_UNDO_LAYERCHANGE = 0x020000, /* layer new/delete/move */ + PCB_UNDO_CLEAR = 0x040000, /* clear/restore to polygons */ + PCB_UNDO_NETLISTCHANGE = 0x080000, /* netlist change */ + PCB_UNDO_CHANGEPINNUM = 0x100000, /* change of pin number */ + PCB_UNDO_CHANGERADII = 0x200000 /* change arc radii */ } pcb_undo_op_t; #endif Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 5025) +++ trunk/src/undo_act.c (revision 5026) @@ -165,7 +165,7 @@ if ((type = pcb_undo(pcb_true))) pcb_board_set_changed_flag(pcb_true); /* check that the undo was of the right type */ - if ((type & UNDO_CREATE) == 0) { + if ((type & PCB_UNDO_CREATE) == 0) { /* wrong undo type, restore anchor points */ Crosshair.AttachedLine.Point2.X = Crosshair.AttachedLine.Point1.X; Crosshair.AttachedLine.Point2.Y = Crosshair.AttachedLine.Point1.Y; @@ -176,7 +176,7 @@ Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X; Crosshair.AttachedLine.Point1.Y = Crosshair.AttachedLine.Point2.Y; /* check if an intermediate point was removed */ - if (type & UNDO_REMOVE) { + if (type & PCB_UNDO_REMOVE) { /* this search should find the restored line */ pcb_search_obj_by_location(PCB_TYPE_LINE | PCB_TYPE_RATLINE, &ptr1, &ptrtmp, &ptr3, Crosshair.AttachedLine.Point2.X, Crosshair.AttachedLine.Point2.Y, 0);