haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix msys2 build.

This commit is contained in:
Jeff Young 2023-12-16 16:17:24 +00:00
parent 66a15f6acf
commit 9fb06f95a0
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/commit.cpp
View File

@ -189,7 +189,7 @@ CHANGE_TYPE COMMIT::convert( UNDO_REDO aType ) const
{ {
case UNDO_REDO::NEWITEM: return CHT_ADD; case UNDO_REDO::NEWITEM: return CHT_ADD;
case UNDO_REDO::DELETED: return CHT_REMOVE; case UNDO_REDO::DELETED: return CHT_REMOVE;
case UNDO_REDO::GROUP: return CHT_GROUP; case UNDO_REDO::REGROUP: return CHT_GROUP;
case UNDO_REDO::UNGROUP: return CHT_UNGROUP; case UNDO_REDO::UNGROUP: return CHT_UNGROUP;
case UNDO_REDO::CHANGED: return CHT_MODIFY; case UNDO_REDO::CHANGED: return CHT_MODIFY;
default: wxASSERT( false ); return CHT_MODIFY; default: wxASSERT( false ); return CHT_MODIFY;
@ -203,7 +203,7 @@ UNDO_REDO COMMIT::convert( CHANGE_TYPE aType ) const
{ {
case CHT_ADD: return UNDO_REDO::NEWITEM; case CHT_ADD: return UNDO_REDO::NEWITEM;
case CHT_REMOVE: return UNDO_REDO::DELETED; case CHT_REMOVE: return UNDO_REDO::DELETED;
case CHT_GROUP: return UNDO_REDO::GROUP; case CHT_GROUP: return UNDO_REDO::REGROUP;
case CHT_UNGROUP: return UNDO_REDO::UNGROUP; case CHT_UNGROUP: return UNDO_REDO::UNGROUP;
case CHT_MODIFY: return UNDO_REDO::CHANGED; case CHT_MODIFY: return UNDO_REDO::CHANGED;
default: wxASSERT( false ); return UNDO_REDO::CHANGED; default: wxASSERT( false ); return UNDO_REDO::CHANGED;

4
include/undo_redo_container.h
View File

@ -67,8 +67,8 @@ enum class UNDO_REDO {
DRILLORIGIN, // origin changed (like CHANGED, contains the origin and a copy) DRILLORIGIN, // origin changed (like CHANGED, contains the origin and a copy)
GRIDORIGIN, // origin changed (like CHANGED, contains the origin and a copy) GRIDORIGIN, // origin changed (like CHANGED, contains the origin and a copy)
PAGESETTINGS, // page settings or title block changes PAGESETTINGS, // page settings or title block changes
GROUP, // new group of items created (do not use GROUP to avoid collision REGROUP, // new group of items created (NB: can't use GROUP because of collision
// with an header on msys2) // with a header on msys2)
UNGROUP // existing group destroyed (items not destroyed) UNGROUP // existing group destroyed (items not destroyed)
}; };

2
pcbnew/board_commit.cpp
View File

@ -394,7 +394,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, int aCommitFlags )
addedGroup->AddItem( boardItem ); addedGroup->AddItem( boardItem );
if( !( aCommitFlags & SKIP_UNDO ) ) if( !( aCommitFlags & SKIP_UNDO ) )
undoList.PushItem( ITEM_PICKER( nullptr, boardItem, UNDO_REDO::GROUP ) ); undoList.PushItem( ITEM_PICKER( nullptr, boardItem, UNDO_REDO::REGROUP ) );
break; break;

2
pcbnew/generators/pcb_tuning_pattern.cpp
View File

@ -1341,7 +1341,7 @@ void PCB_TUNING_PATTERN::EditPush( GENERATOR_TOOL* aTool, BOARD* aBoard, BOARD_C
&& bounds.PointInside( track->GetEnd(), epsilon ) ) && bounds.PointInside( track->GetEnd(), epsilon ) )
{ {
AddItem( item ); AddItem( item );
groupUndoList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::GROUP ) ); groupUndoList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::REGROUP ) );
} }
} }

2
pcbnew/tools/drawing_tool.cpp
View File

@ -1550,7 +1550,7 @@ int DRAWING_TOOL::PlaceImportedGraphics( const TOOL_EVENT& aEvent )
selectedItems.push_back( item ); selectedItems.push_back( item );
} }
groupUndoList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::GROUP ) ); groupUndoList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::REGROUP ) );
layer = item->GetLayer(); layer = item->GetLayer();

2
pcbnew/tools/group_tool.cpp
View File

@ -274,7 +274,7 @@ int GROUP_TOOL::Group( const TOOL_EVENT& aEvent )
for( EDA_ITEM* eda_item : selection ) for( EDA_ITEM* eda_item : selection )
{ {
if( BOARD_ITEM* item = dynamic_cast<BOARD_ITEM*>( eda_item ) ) if( BOARD_ITEM* item = dynamic_cast<BOARD_ITEM*>( eda_item ) )
groupList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::GROUP ) ); groupList.PushItem( ITEM_PICKER( nullptr, item, UNDO_REDO::REGROUP ) );
} }
commit.Stage( groupList ); commit.Stage( groupList );

8
pcbnew/undo_redo.cpp
View File

@ -141,7 +141,7 @@ void PCB_BASE_EDIT_FRAME::saveCopyInUndoList( PICKED_ITEMS_LIST* commandToUndo,
case UNDO_REDO::NEWITEM: case UNDO_REDO::NEWITEM:
case UNDO_REDO::DELETED: case UNDO_REDO::DELETED:
case UNDO_REDO::PAGESETTINGS: case UNDO_REDO::PAGESETTINGS:
case UNDO_REDO::GROUP: case UNDO_REDO::REGROUP:
case UNDO_REDO::UNGROUP: case UNDO_REDO::UNGROUP:
break; break;
@ -295,7 +295,7 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
UNDO_REDO status = aList->GetPickedItemStatus( ii ); UNDO_REDO status = aList->GetPickedItemStatus( ii );
if( status != UNDO_REDO::DELETED if( status != UNDO_REDO::DELETED
&& status != UNDO_REDO::GROUP && status != UNDO_REDO::REGROUP
&& status != UNDO_REDO::UNGROUP && status != UNDO_REDO::UNGROUP
&& status != UNDO_REDO::DRILLORIGIN // origin markers never on board && status != UNDO_REDO::DRILLORIGIN // origin markers never on board
&& status != UNDO_REDO::GRIDORIGIN // origin markers never on board && status != UNDO_REDO::GRIDORIGIN // origin markers never on board
@ -419,7 +419,7 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
break; break;
case UNDO_REDO::GROUP: case UNDO_REDO::REGROUP:
aList->SetPickedItemStatus( UNDO_REDO::UNGROUP, ii ); aList->SetPickedItemStatus( UNDO_REDO::UNGROUP, ii );
if( BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( eda_item ) ) if( BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( eda_item ) )
@ -428,7 +428,7 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
break; break;
case UNDO_REDO::UNGROUP: case UNDO_REDO::UNGROUP:
aList->SetPickedItemStatus( UNDO_REDO::GROUP, ii ); aList->SetPickedItemStatus( UNDO_REDO::REGROUP, ii );
if( BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( eda_item ) ) if( BOARD_ITEM* boardItem = dynamic_cast<BOARD_ITEM*>( eda_item ) )
{ {