Commit 2ce4f404 authored by jean-pierre charras's avatar jean-pierre charras

Pcbnew: add missing call to SetMouseCapture( NULL, NULL ) in abort functions.

parent c1347bbe
...@@ -35,6 +35,8 @@ void Abort_Edit_Pcb_Text( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -35,6 +35,8 @@ void Abort_Edit_Pcb_Text( EDA_DRAW_PANEL* Panel, wxDC* DC )
TEXTE_PCB* TextePcb = (TEXTE_PCB*) Panel->GetScreen()->GetCurItem(); TEXTE_PCB* TextePcb = (TEXTE_PCB*) Panel->GetScreen()->GetCurItem();
( (WinEDA_PcbFrame*) Panel->GetParent() )->SetCurItem( NULL ); ( (WinEDA_PcbFrame*) Panel->GetParent() )->SetCurItem( NULL );
Panel->SetMouseCapture( NULL, NULL );
if( TextePcb == NULL ) // Should not occur if( TextePcb == NULL ) // Should not occur
return; return;
......
...@@ -130,6 +130,8 @@ static void AbortMoveTextModule( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -130,6 +130,8 @@ static void AbortMoveTextModule( EDA_DRAW_PANEL* Panel, wxDC* DC )
TEXTE_MODULE* Text = (TEXTE_MODULE*) screen->GetCurItem(); TEXTE_MODULE* Text = (TEXTE_MODULE*) screen->GetCurItem();
MODULE* Module; MODULE* Module;
Panel->SetMouseCapture( NULL, NULL );
if( Text == NULL ) if( Text == NULL )
return; return;
......
...@@ -177,6 +177,8 @@ static void AbortMoveAndEditTarget( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -177,6 +177,8 @@ static void AbortMoveAndEditTarget( EDA_DRAW_PANEL* Panel, wxDC* DC )
( (WinEDA_PcbFrame*) Panel->GetParent() )->SetCurItem( NULL ); ( (WinEDA_PcbFrame*) Panel->GetParent() )->SetCurItem( NULL );
Panel->SetMouseCapture( NULL, NULL );
if( MirePcb == NULL ) if( MirePcb == NULL )
return; return;
......
...@@ -121,6 +121,7 @@ void Abort_MoveOrCopyModule( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -121,6 +121,7 @@ void Abort_MoveOrCopyModule( EDA_DRAW_PANEL* Panel, wxDC* DC )
module = (MODULE*) pcbframe->GetScreen()->GetCurItem(); module = (MODULE*) pcbframe->GetScreen()->GetCurItem();
pcbframe->GetBoard()->m_Status_Pcb &= ~RATSNEST_ITEM_LOCAL_OK; pcbframe->GetBoard()->m_Status_Pcb &= ~RATSNEST_ITEM_LOCAL_OK;
Panel->SetMouseCapture( NULL, NULL );
if( module ) if( module )
{ {
......
...@@ -26,6 +26,8 @@ static void Abort_Move_Pad( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -26,6 +26,8 @@ static void Abort_Move_Pad( EDA_DRAW_PANEL* Panel, wxDC* DC )
{ {
D_PAD* pad = s_CurrentSelectedPad; D_PAD* pad = s_CurrentSelectedPad;
Panel->SetMouseCapture( NULL, NULL );
if( pad == NULL ) if( pad == NULL )
return; return;
......
...@@ -129,6 +129,7 @@ static void Abort_MoveTrack( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -129,6 +129,7 @@ static void Abort_MoveTrack( EDA_DRAW_PANEL* Panel, wxDC* DC )
Panel, DC, g_HighLight_NetCode ); Panel, DC, g_HighLight_NetCode );
EraseDragList(); EraseDragList();
Panel->SetMouseCapture( NULL, NULL );
} }
......
...@@ -155,6 +155,7 @@ static void Abort_Zone_Create_Outline( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -155,6 +155,7 @@ static void Abort_Zone_Create_Outline( EDA_DRAW_PANEL* Panel, wxDC* DC )
pcbframe->SetCurItem( NULL ); pcbframe->SetCurItem( NULL );
s_AddCutoutToCurrentZone = false; s_AddCutoutToCurrentZone = false;
s_CurrentZone = NULL; s_CurrentZone = NULL;
Panel->SetMouseCapture( NULL, NULL );
} }
...@@ -413,6 +414,7 @@ void Abort_Zone_Move_Corner_Or_Outlines( EDA_DRAW_PANEL* Panel, wxDC* DC ) ...@@ -413,6 +414,7 @@ void Abort_Zone_Move_Corner_Or_Outlines( EDA_DRAW_PANEL* Panel, wxDC* DC )
} }
} }
Panel->SetMouseCapture( NULL, NULL );
_AuxiliaryList.ClearListAndDeleteItems(); _AuxiliaryList.ClearListAndDeleteItems();
s_PickedList. ClearListAndDeleteItems(); s_PickedList. ClearListAndDeleteItems();
Panel->Refresh(); Panel->Refresh();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment