Browse Source

Fix Bug #1498252 (segfault + assert failed in Yield(): wxYield called recursively) and a few other issues (footprint viewer or 3D viewer not always raised in some cases). Linux specific

pull/7/head
jean-pierre charras 10 years ago
parent
commit
a112a33fa2
  1. 4
      common/kiway_player.cpp
  2. 3
      cvpcb/class_DisplayFootprintsFrame.cpp
  3. 1
      pcbnew/footprint_wizard_frame.cpp
  4. 1
      pcbnew/moduleframe.cpp
  5. 1
      pcbnew/modview_frame.cpp
  6. 1
      pcbnew/pcbframe.cpp

4
common/kiway_player.cpp

@ -100,8 +100,8 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
m_modal_resultant_parent = aResultantFocusWindow;
Raise(); // Needed on Ubuntu-14/Unity to display the frame
Show( true );
Raise(); // Needed on sole Window managers to always display the frame
SetFocus();
@ -146,7 +146,7 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
// have the final say, after wxWindowDisabler reenables my parent and
// the events settle down, set the focus
wxYield();
wxSafeYield();
aResultantFocusWindow->SetFocus();
}

3
cvpcb/class_DisplayFootprintsFrame.cpp

@ -398,7 +398,8 @@ void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event )
return;
}
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, _( "3D Viewer" ), KICAD_DEFAULT_3D_DRAWFRAME_STYLE );
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, _( "3D Viewer" ) );
m_Draw3DFrame->Raise(); // Needed with some Window Managers
m_Draw3DFrame->Show( true );
}

1
pcbnew/footprint_wizard_frame.cpp

@ -531,6 +531,7 @@ void FOOTPRINT_WIZARD_FRAME::Show3D_Frame( wxCommandEvent& event )
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, wxEmptyString );
Update3D_Frame( false );
m_Draw3DFrame->Raise(); // Needed with some Window Managers
m_Draw3DFrame->Show( true );
}

1
pcbnew/moduleframe.cpp

@ -689,6 +689,7 @@ void FOOTPRINT_EDIT_FRAME::Show3D_Frame( wxCommandEvent& event )
}
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, _( "3D Viewer" ) );
m_Draw3DFrame->Raise(); // Needed with some Window Managers
m_Draw3DFrame->Show( true );
}

1
pcbnew/modview_frame.cpp

@ -631,6 +631,7 @@ void FOOTPRINT_VIEWER_FRAME::Show3D_Frame( wxCommandEvent& event )
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, wxEmptyString );
Update3D_Frame( false );
m_Draw3DFrame->Raise(); // Needed with some Window Managers
m_Draw3DFrame->Show( true );
}

1
pcbnew/pcbframe.cpp

@ -655,6 +655,7 @@ void PCB_EDIT_FRAME::Show3D_Frame( wxCommandEvent& event )
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, _( "3D Viewer" ) );
m_Draw3DFrame->SetDefaultFileName( GetBoard()->GetFileName() );
m_Draw3DFrame->Raise(); // Needed with some Window Managers
m_Draw3DFrame->Show( true );
}

Loading…
Cancel
Save