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

fix formatting goofs

This commit is contained in:
Dick Hollenbeck 2013-10-17 13:47:46 -05:00
parent 8609dfe283
commit e8ee26344f
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
pcbnew/edit.cpp
View File

@ -191,51 +191,51 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
case ID_OPEN_MODULE_EDITOR: case ID_OPEN_MODULE_EDITOR:
{ {
FOOTPRINT_EDIT_FRAME * editorFrame = FOOTPRINT_EDIT_FRAME* editorFrame = FOOTPRINT_EDIT_FRAME::GetActiveFootprintEditor();
FOOTPRINT_EDIT_FRAME::GetActiveFootprintEditor();
if( editorFrame == NULL )
{
editorFrame = new FOOTPRINT_EDIT_FRAME( this, m_footprintLibTable );
editorFrame->Show( true );
editorFrame->Zoom_Automatique( false );
}
else
{
if( editorFrame->IsIconized() )
editorFrame->Iconize( false );
editorFrame->Raise(); if( editorFrame == NULL )
{
editorFrame = new FOOTPRINT_EDIT_FRAME( this, m_footprintLibTable );
editorFrame->Show( true );
editorFrame->Zoom_Automatique( false );
}
else
{
if( editorFrame->IsIconized() )
editorFrame->Iconize( false );
// Raising the window does not set the focus on Linux. This should work on editorFrame->Raise();
// any platform.
if( wxWindow::FindFocus() != editorFrame ) // Raising the window does not set the focus on Linux. This should work on
editorFrame->SetFocus(); // any platform.
} if( wxWindow::FindFocus() != editorFrame )
editorFrame->SetFocus();
}
} }
break; break;
case ID_OPEN_MODULE_VIEWER: case ID_OPEN_MODULE_VIEWER:
{ {
FOOTPRINT_VIEWER_FRAME * viewer = FOOTPRINT_VIEWER_FRAME * viewer =
FOOTPRINT_VIEWER_FRAME::GetActiveFootprintViewer(); FOOTPRINT_VIEWER_FRAME::GetActiveFootprintViewer();
if( viewer == NULL ) if( viewer == NULL )
{ {
viewer = new FOOTPRINT_VIEWER_FRAME( this, m_footprintLibTable, NULL ); viewer = new FOOTPRINT_VIEWER_FRAME( this, m_footprintLibTable, NULL );
viewer->Show( true ); viewer->Show( true );
viewer->Zoom_Automatique( false ); viewer->Zoom_Automatique( false );
} }
else else
{ {
if( viewer->IsIconized() ) if( viewer->IsIconized() )
viewer->Iconize( false ); viewer->Iconize( false );
viewer->Raise(); viewer->Raise();
// Raising the window does not set the focus on Linux. This should work on // Raising the window does not set the focus on Linux. This should work on
// any platform. // any platform.
if( wxWindow::FindFocus() != viewer ) if( wxWindow::FindFocus() != viewer )
viewer->SetFocus(); viewer->SetFocus();
} }
} }
break; break;
@ -833,15 +833,15 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
GetCurItem()->SetTimeStamp( GetNewTimeStamp() ); GetCurItem()->SetTimeStamp( GetNewTimeStamp() );
OnModify(); OnModify();
} }
{
FOOTPRINT_EDIT_FRAME * editorFrame = FOOTPRINT_EDIT_FRAME::GetActiveFootprintEditor();
{
FOOTPRINT_EDIT_FRAME* editorFrame = FOOTPRINT_EDIT_FRAME::GetActiveFootprintEditor();
if( editorFrame == NULL ) if( editorFrame == NULL )
editorFrame = new FOOTPRINT_EDIT_FRAME( this, m_footprintLibTable ); editorFrame = new FOOTPRINT_EDIT_FRAME( this, m_footprintLibTable );
editorFrame->Load_Module_From_BOARD( (MODULE*)GetCurItem() ); editorFrame->Load_Module_From_BOARD( (MODULE*)GetCurItem() );
SetCurItem( NULL ); // the current module could be deleted by SetCurItem( NULL ); // the current module could be deleted by
editorFrame->Show( true ); editorFrame->Show( true );
editorFrame->Iconize( false ); editorFrame->Iconize( false );