Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 6673) +++ trunk/scconfig/Rev.h (revision 6674) @@ -1 +1 @@ -static const int myrev = 6673; +static const int myrev = 6674; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 6673) +++ trunk/scconfig/Rev.tab (revision 6674) @@ -1,4 +1,4 @@ -6673 configure gtk splitup +6674 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 6673) +++ trunk/src/Makefile.dep (revision 6674) @@ -1472,41 +1472,6 @@ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/in_mouse.h \ ../src_plugins/lib_gtk_common/win_place.h -../src_plugins/hid_gtk/gui-utils.o: ../src_plugins/hid_gtk/gui-utils.c \ - ../config.h ../src_plugins/hid_gtk/gui.h board.h const.h macro.h \ - global_typedefs.h pcb_bool.h unit.h vtroutestyle.h attrib.h \ - ../src_3rd/genvector/genvector_impl.h \ - ../src_3rd/genvector/genvector_undef.h layer.h globalconst.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 ../src_3rd/genlist/gentdlist_impl.h \ - ../src_3rd/genlist/gendlist.h ../src_3rd/genlist/gentdlist_undef.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 ../src_3rd/liblihata/genht/ht_inlines.h \ - obj_poly_list.h obj_poly.h polyarea.h obj_text_list.h obj_rat_list.h \ - obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \ - math_helper.h move.h misc_util.h hid.h error.h drc.h hid_cfg.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 hid_cfg_input.h \ - ../src_3rd/liblihata/genht/htip.h hid_cfg.h data.h crosshair.h \ - vtonpoint.h hid.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 \ - conf_core.h conf.h pcb-printf.h ../src_3rd/genvector/gds_char.h \ - ../src_3rd/liblihata/lihata.h ../src_3rd/genvector/vtp0.h list_conf.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/menu_lht.o: ../src_plugins/hid_gtk/menu_lht.c ../src_plugins/hid_lesstif/dialogs.o: \ ../src_plugins/hid_lesstif/dialogs.c \ Index: trunk/src_plugins/hid_gtk/gui-utils.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-utils.c (revision 6673) +++ trunk/src_plugins/hid_gtk/gui-utils.c (nonexistent) @@ -1,38 +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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -/* This module, gui-utils.c, was written by Bill Wilson and the functions - * here are Copyright (C) 2004 by Bill Wilson. These functions are utility - * functions which are taken from my other GPL'd projects gkrellm and - * gstocks and are copied here for the Gtk PCB port. - */ - -#include "config.h" -//#include "conf_core.h" - -#include "gui.h" - - -void ghid_draw_area_update(GHidPort * port, GdkRectangle * rect) -{ - gdk_window_invalidate_rect(gtk_widget_get_window(port->drawing_area), rect, FALSE); -} Index: trunk/src_plugins/hid_gtk/Plug.tmpasm =================================================================== --- trunk/src_plugins/hid_gtk/Plug.tmpasm (revision 6673) +++ trunk/src_plugins/hid_gtk/Plug.tmpasm (revision 6674) @@ -16,7 +16,6 @@ $(PLUGDIR)/hid_gtk/gui-output-events.o $(PLUGDIR)/hid_gtk/gui-pinout-window.o $(PLUGDIR)/hid_gtk/gui-top-window.o - $(PLUGDIR)/hid_gtk/gui-utils.o $(PLUGDIR)/hid_gtk/gtkhid-gdk.o $(PLUGDIR)/hid_gtk/menu_lht.o $(PLUGDIR)/hid_gtk/gtk_conf_list.o Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6673) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 6674) @@ -1542,6 +1542,10 @@ ghid_set_status_line_label_(ghidgui->status_line_label, conf_hid_gtk.plugins.hid_gtk.compact_horizontal); \ } +void ghid_draw_area_update(GHidPort *port, GdkRectangle *rect) +{ + gdk_window_invalidate_rect(gtk_widget_get_window(port->drawing_area), rect, FALSE); +} pcb_hid_action_t ghid_main_action_list[] = { {"About", 0, About, about_help, about_syntax}