← Back to branch summary

~cern-kicad/kicad/kicad-pns-tom

« back to all changes in this revision

Viewing changes to pcbnew/edit.cpp

  • Committer: Maciej Suminski
  • Date: 2013-08-02 13:57:24 UTC
  • mfrom: (4024.1.238 kicad)
  • mto: This revision was merged to the branch mainline in revision 4221.
  • Revision ID: maciej.suminski@cern.ch-20130802135724-gix6orezshkukodv
Upstream merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pcbnew/edit.cpp
1129
1129
        break;
1130
1130
 
1131
1131
    case ID_PCB_USER_GRID_SETUP:
1132
 
        InstallGridFrame( pos );
 
1132
        InvokeDialogGrid();
1133
1133
        break;
1134
1134
 
1135
1135
    case ID_POPUP_PCB_DISPLAY_FOOTPRINT_DOC:
1136
 
    {
1137
 
        wxConfig* cfg = wxGetApp().GetCommonSettings();
1138
 
        cfg->Read( wxT( "module_doc_file" ), g_DocModulesFileName );
1139
 
        GetAssociatedDocument( this, g_DocModulesFileName, &wxGetApp().GetLibraryPathList() );
1140
 
    }
1141
 
    break;
 
1136
        {
 
1137
            wxConfig* cfg = wxGetApp().GetCommonSettings();
 
1138
            cfg->Read( wxT( "module_doc_file" ), g_DocModulesFileName );
 
1139
            GetAssociatedDocument( this, g_DocModulesFileName, &wxGetApp().GetLibraryPathList() );
 
1140
        }
 
1141
        break;
1142
1142
 
1143
1143
    case ID_MENU_ARCHIVE_NEW_MODULES:
1144
1144
        ArchiveModulesOnBoard( wxEmptyString, true );
1201
1201
        break;
1202
1202
 
1203
1203
    case PCB_ZONE_AREA_T:
1204
 
    {
1205
 
        SetCurItem( NULL );
1206
 
        int netcode = ( (ZONE_CONTAINER*) Item )->GetNet();
1207
 
        Delete_Zone_Contour( DC, (ZONE_CONTAINER*) Item );
1208
 
        TestNetConnection( NULL, netcode );
1209
 
        SetMsgPanel( GetBoard() );
1210
 
    }
1211
 
 
1212
 
    break;
 
1204
        {
 
1205
            SetCurItem( NULL );
 
1206
            int netcode = ( (ZONE_CONTAINER*) Item )->GetNet();
 
1207
            Delete_Zone_Contour( DC, (ZONE_CONTAINER*) Item );
 
1208
            TestNetConnection( NULL, netcode );
 
1209
            SetMsgPanel( GetBoard() );
 
1210
        }
 
1211
        break;
1213
1212
 
1214
1213
    case PCB_MARKER_T:
1215
1214
        if( Item == GetCurItem() )
1229
1228
    case TYPE_NOT_INIT:
1230
1229
    case PCB_T:
1231
1230
    default:
1232
 
    {
1233
 
        wxString Line;
1234
 
        Line.Printf( wxT( "Remove: item type %d unknown." ), Item->Type() );
1235
 
        DisplayError( this, Line );
1236
 
    }
1237
 
    break;
 
1231
        {
 
1232
            wxString msg = wxString::Format(
 
1233
                wxT( "Remove: item type %d unknown." ), Item->Type() );
 
1234
            DisplayError( this, msg );
 
1235
        }
 
1236
        break;
1238
1237
    }
1239
1238
}
1240
1239