Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6672) +++ trunk/scconfig/Rev.h (revision 6673) @@ -1 +1 @@ -static const int myrev = 6668; +static const int myrev = 6673; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6672) +++ trunk/scconfig/Rev.tab (revision 6673) @@ -1,4 +1,4 @@ -6668 configure gtk splitup +6673 configure gtk splitup 6392 configure draw cross section plugin (gtk and lesstif depend on it) 6365 configure gtk splitup 6111 configure layer vs. layer group code split Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 6672) +++ trunk/src/Makefile.dep (revision 6673) @@ -1310,42 +1310,6 @@ ../src_plugins/lib_gtk_common/dlg_propedit.h \ ../src_plugins/lib_gtk_common/bu_cursor_pos.h pcb-printf.h hid_actions.h \ compat_nls.h ../src_plugins/lib_gtk_common/win_place.h -../src_plugins/hid_gtk/gui-misc.o: ../src_plugins/hid_gtk/gui-misc.c \ - ../config.h conf_core.h conf.h global_typedefs.h pcb_bool.h unit.h \ - pcb-printf.h ../src_3rd/genvector/gds_char.h \ - ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \ - ../src_3rd/liblihata/parser.h ../src_3rd/liblihata/genht/htsp.h \ - ../src_3rd/liblihata/genht/ht.h ../src_3rd/liblihata/genht/ht_inlines.h \ - ../src_3rd/genvector/vtp0.h list_conf.h \ - ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h globalconst.h math_helper.h crosshair.h \ - vtonpoint.h hid.h error.h drc.h attrib.h layer.h obj_all_list.h \ - obj_arc_list.h obj_common.h ../src_3rd/liblihata/genht/hash.h \ - ../src_3rd/genlist/gendlist.h flag.h obj_arc.h obj_elem_list.h \ - obj_elem.h obj_line_list.h obj_line.h obj_pad_list.h obj_pad.h \ - obj_pinvia_list.h obj_pinvia.h obj_text.h ht_element.h \ - ../src_3rd/liblihata/genht/ht.h obj_poly_list.h obj_poly.h polyarea.h \ - obj_text_list.h obj_rat_list.h obj_rat.h layer_grp.h pcb-printf.h \ - compat_nls.h ../src_plugins/hid_gtk/gui.h board.h const.h macro.h \ - vtroutestyle.h library.h rats_patch.h board.h font.h box.h math_helper.h \ - move.h misc_util.h hid.h hid_cfg.h hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h buffer.h \ - ../src_plugins/hid_gtk/ghid-main-menu.h \ - ../src_plugins/lib_gtk_common/wt_layer_selector.h \ - ../src_plugins/hid_gtk/ghid-route-style-selector.h route_style.h event.h \ - compat_misc.h ../src_plugins/hid_gtk/colors.h \ - ../src_plugins/hid_gtk/hid_gtk_conf.h conf.h \ - ../src_plugins/lib_gtk_common/ui_zoompan.h \ - ../src_plugins/lib_gtk_common/bu_box.h \ - ../src_plugins/lib_gtk_common/bu_text_view.h \ - ../src_plugins/lib_gtk_common/bu_check_button.h \ - ../src_plugins/lib_gtk_common/bu_spin_button.h \ - ../src_plugins/lib_gtk_common/bu_status_line.h \ - ../src_plugins/lib_gtk_common/wt_coord_entry.h unit.h \ - ../src_plugins/lib_gtk_common/dlg_propedit.h \ - ../src_plugins/lib_gtk_common/bu_cursor_pos.h ../src_plugins/hid_gtk/gui-netlist-window.o: \ ../src_plugins/hid_gtk/gui-netlist-window.c ../config.h conf_core.h \ conf.h global_typedefs.h pcb_bool.h unit.h pcb-printf.h \ Index: trunk/src_plugins/hid_gtk/gui-misc.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-misc.c (revision 6672) +++ trunk/src_plugins/hid_gtk/gui-misc.c (nonexistent) @@ -1,37 +0,0 @@ -/* - * COPYRIGHT - * - * PCB, interactive printed circuit board design - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -/* This file was originally written by Bill Wilson for the PCB Gtk port */ - -#include "config.h" -#include "conf_core.h" - -#include "math_helper.h" -#include "crosshair.h" -#include "pcb-printf.h" -#include "compat_nls.h" - -/*FIXME: needed for ghidgui , but need to be removed */ -#include "gui.h" - -const char *ghid_cookie = "gtk hid"; -const char *ghid_menu_cookie = "gtk hid menu"; Index: trunk/src_plugins/hid_gtk/Plug.tmpasm =================================================================== --- trunk/src_plugins/hid_gtk/Plug.tmpasm (revision 6672) +++ trunk/src_plugins/hid_gtk/Plug.tmpasm (revision 6673) @@ -12,7 +12,6 @@ $(PLUGDIR)/hid_gtk/gui-keyref-window.o $(PLUGDIR)/hid_gtk/gui-library-window.o $(PLUGDIR)/hid_gtk/gui-log-window.o - $(PLUGDIR)/hid_gtk/gui-misc.o $(PLUGDIR)/hid_gtk/gui-netlist-window.o $(PLUGDIR)/hid_gtk/gui-output-events.o $(PLUGDIR)/hid_gtk/gui-pinout-window.o Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6672) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6673) @@ -41,6 +41,9 @@ #include "../src_plugins/lib_gtk_common/dlg_print.h" #include "../src_plugins/lib_gtk_common/dlg_report.h" +const char *ghid_cookie = "gtk hid"; +const char *ghid_menu_cookie = "gtk hid menu"; + conf_hid_id_t ghid_conf_id = -1; conf_hid_id_t ghid_menuconf_id = -1; GdkModifierType ghid_glob_mask;