Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 9892) +++ trunk/src_plugins/export_dsn/dsn.c (revision 9893) @@ -221,7 +221,7 @@ pcb_layer_t *layer = iter->data; char *layeropts = pcb_strdup("(type signal)"); - if (!(pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, layer)) & PCB_LYT_COPPER)) + if (!(pcb_layer_flags_(PCB, layer) & PCB_LYT_COPPER)) continue; /* see if layer has same name as a net and make it a power layer */ Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 9892) +++ trunk/src_plugins/io_pcb/file.c (revision 9893) @@ -481,7 +481,7 @@ */ static const char *layer_name_hack(pcb_layer_t *layer, const char *name) { - unsigned long lflg = pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, layer)); + unsigned long lflg = pcb_layer_flags_(PCB, layer); /* The old PCB format encodes some properties in layer names - have to alter the real layer name before save to get the same effect */ if (lflg & PCB_LYT_OUTLINE) { Index: trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 9892) +++ trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 9893) @@ -59,7 +59,7 @@ return NULL; /* don't mess with silk objects! */ - if ((type & PCB_SILK_TYPE) && (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1)) & PCB_LYT_SILK)) + if ((type & PCB_SILK_TYPE) && (pcb_layer_flags_(PCB, (pcb_layer_t *) ptr1) & PCB_LYT_SILK)) return NULL; if (type == PCB_TYPE_PIN || type == PCB_TYPE_PAD) Index: trunk/src_plugins/lib_gtk_common/dlg_about.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_about.c (revision 9892) +++ trunk/src_plugins/lib_gtk_common/dlg_about.c (revision 9893) @@ -51,6 +51,7 @@ /*gtk_widget_set_can_default(button, TRUE);*/ gtk_widget_show(button); +#if 0 #ifdef PCB_GTK3 action_area = gtk_dialog_get_header_bar(GTK_DIALOG(about)); gtk_container_add (GTK_CONTAINER (action_area), button); @@ -59,6 +60,7 @@ gtk_box_pack_end(GTK_BOX(action_area), button, FALSE, TRUE, 0); gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(action_area), button, TRUE); #endif +#endif g_signal_connect(button, "clicked", G_CALLBACK(display_options_dialog), about); /* We don't want to maintain a list of authors... So, this is the minimum info */ Index: trunk/src_plugins/plugins_ALL.tmpasm =================================================================== --- trunk/src_plugins/plugins_ALL.tmpasm (revision 9892) +++ trunk/src_plugins/plugins_ALL.tmpasm (revision 9893) @@ -49,6 +49,7 @@ include {../src_plugins/import_netlist/Plug.tmpasm} include {../src_plugins/import_sch/Plug.tmpasm} include {../src_plugins/import_tinycad/Plug.tmpasm} +include {../src_plugins/io_autotrax/Plug.tmpasm} include {../src_plugins/io_eagle/Plug.tmpasm} include {../src_plugins/io_hyp/Plug.tmpasm} include {../src_plugins/io_kicad/Plug.tmpasm} Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 9892) +++ trunk/src_plugins/query/query_access.c (revision 9893) @@ -241,8 +241,8 @@ switch(fh1) { case query_fields_name: PCB_QRY_RET_STR(res, l->meta.real.name); case query_fields_visible: PCB_QRY_RET_INT(res, l->meta.real.vis); - case query_fields_position: PCB_QRY_RET_INT(res, pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, l)) & PCB_LYT_ANYWHERE); - case query_fields_type: PCB_QRY_RET_INT(res, pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, l)) & PCB_LYT_ANYTHING); + case query_fields_position: PCB_QRY_RET_INT(res, pcb_layer_flags_(PCB, l) & PCB_LYT_ANYWHERE); + case query_fields_type: PCB_QRY_RET_INT(res, pcb_layer_flags_(PCB, l) & PCB_LYT_ANYTHING); default:; } Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 9892) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 9893) @@ -694,7 +694,7 @@ { pcb_layer_t *layer = (pcb_layer_t *) Ptr1; pcb_line_t *line = (pcb_line_t *) Ptr2; - if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, layer)) & PCB_LYT_COPPER) { + if (pcb_layer_flags_(PCB, layer) & PCB_LYT_COPPER) { CheckLinePointForRubberbandConnection(rbnd, layer, line, &line->Point1, pcb_false); CheckLinePointForRubberbandConnection(rbnd, layer, line, &line->Point2, pcb_false); } @@ -702,7 +702,7 @@ } case PCB_TYPE_LINE_POINT: - if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER) { + if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER) { CheckLinePointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true); CheckLinePointForRubberbandArcConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true); } @@ -709,12 +709,12 @@ break; case PCB_TYPE_ARC_POINT: - if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER) + if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER) CheckArcPointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, (int *) Ptr3, pcb_true); break; case PCB_TYPE_ARC: - if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER) + if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER) CheckArcForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, pcb_true); break; @@ -723,7 +723,7 @@ break; case PCB_TYPE_POLYGON: - if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER) + if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER) CheckPolygonForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_polygon_t *) Ptr2); break; }