[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-116-g1bfa2ba)
The branch, master has been updated
via 1bfa2bacae85a59758c6b6ddb16bc62362b9ac7e (commit)
via 288d9e67af83f03534398319d0e8ad16fa631fb0 (commit)
via 51843b80f3ab5b2d5f0a3cb52bb09b9001ae80ae (commit)
via 692a7d38eac4800e355623fe9cbbbf4ffb7c412d (commit)
via 80f19b131300110c67d332193959e33f230f0b1d (commit)
via a27996354d61af13a4f0a1eed2db4b979b7f148f (commit)
via 2e87904a34cd5ad58bc8a9511dd5915adf9df405 (commit)
from 11a2692a1ab8bcee14178286fd719d1ec39e6b9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gschem/configure.ac.in | 2 +-
gschem/include/Makefile.am | 1 +
gschem/include/gschem.h | 24 +++++++
gschem/include/gschem_defines.h | 129 +++++++++++++++++++++++++++++++++++++
gschem/src/a_pan.c | 6 +--
gschem/src/a_zoom.c | 6 +--
gschem/src/g_funcs.c | 7 +--
gschem/src/g_hook.c | 6 +--
gschem/src/g_keys.c | 6 +--
gschem/src/g_rc.c | 7 +--
gschem/src/g_register.c | 6 +--
gschem/src/globals.c | 6 +--
gschem/src/gschem.c | 7 +--
gschem/src/gschem_dialog.c | 7 +--
gschem/src/gschem_toplevel.c | 7 +--
gschem/src/i_basic.c | 6 +--
gschem/src/i_callbacks.c | 6 +--
gschem/src/i_vars.c | 6 +--
gschem/src/o_arc.c | 6 +--
gschem/src/o_attrib.c | 6 +--
gschem/src/o_basic.c | 6 +--
gschem/src/o_box.c | 6 +--
gschem/src/o_buffer.c | 8 +--
gschem/src/o_bus.c | 6 +--
gschem/src/o_circle.c | 6 +--
gschem/src/o_complex.c | 6 +--
gschem/src/o_copy.c | 6 +--
gschem/src/o_cue.c | 6 +--
gschem/src/o_delete.c | 6 +--
gschem/src/o_find.c | 6 +--
gschem/src/o_grips.c | 16 ++---
gschem/src/o_line.c | 6 +--
gschem/src/o_misc.c | 6 +--
gschem/src/o_move.c | 8 +--
gschem/src/o_net.c | 6 +--
gschem/src/o_picture.c | 6 +--
gschem/src/o_pin.c | 7 +--
gschem/src/o_place.c | 6 +--
gschem/src/o_select.c | 7 +--
gschem/src/o_slot.c | 6 +--
gschem/src/o_text.c | 8 +--
gschem/src/o_undo.c | 6 +--
gschem/src/parsecmd.c | 6 +--
gschem/src/x_attribedit.c | 9 +---
gschem/src/x_autonumber.c | 9 +---
gschem/src/x_basic.c | 6 +--
gschem/src/x_color.c | 40 +++++-------
gschem/src/x_compselect.c | 7 +--
gschem/src/x_dialog.c | 9 +---
gschem/src/x_event.c | 6 +--
gschem/src/x_fileselect.c | 10 +---
gschem/src/x_grid.c | 6 +--
gschem/src/x_image.c | 7 +--
gschem/src/x_log.c | 9 +---
gschem/src/x_menus.c | 6 +--
gschem/src/x_multiattrib.c | 11 +---
gschem/src/x_pagesel.c | 9 +---
gschem/src/x_preview.c | 8 +--
gschem/src/x_print.c | 8 +--
gschem/src/x_script.c | 6 +--
gschem/src/x_stroke.c | 10 +--
gschem/src/x_window.c | 7 +--
libgeda/configure.ac.in | 66 ++++++-------------
libgeda/include/defines.h | 134 ---------------------------------------
libgeda/include/geda_list.h | 1 -
libgeda/include/libgeda.h | 1 -
libgeda/include/libgeda_priv.h | 3 +-
libgeda/include/struct.h | 4 +-
libgeda/src/o_picture.c | 1 -
libgeda/src/s_color.c | 3 +-
70 files changed, 270 insertions(+), 539 deletions(-)
create mode 100644 gschem/include/gschem.h
create mode 100644 gschem/include/gschem_defines.h
=================
Commit Messages
=================
commit 1bfa2bacae85a59758c6b6ddb16bc62362b9ac7e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:48:00 2008 +0100
gschem: Add #define LAST_DRAWB_MODE_NONE -1
This flag will be used to indicate that the bounding box was not drawn
onto the page at all yet.
:100644 100644 6337cf3... c190518... M gschem/include/gschem_defines.h
:100644 100644 6ccac84... d3f8b3e... M gschem/src/gschem_toplevel.c
:100644 100644 eb02972... 2059e63... M gschem/src/o_buffer.c
:100644 100644 a126741... c648865... M gschem/src/o_grips.c
:100644 100644 4bd82c1... 1043614... M gschem/src/o_move.c
:100644 100644 861fa39... cc66b18... M gschem/src/o_text.c
commit 288d9e67af83f03534398319d0e8ad16fa631fb0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:48:00 2008 +0100
Move gschem defines from libgeda into gschem/include/gschem_defines.h
Whilst we're at it, remove some unused definitions.
:100644 100644 6b936c0... b5180b7... M gschem/include/gschem.h
:000000 100644 0000000... 6337cf3... A gschem/include/gschem_defines.h
:100644 100644 7c0e39d... 9572f2c... M libgeda/include/defines.h
commit 51843b80f3ab5b2d5f0a3cb52bb09b9001ae80ae
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:48:00 2008 +0100
libgeda: Delete unused #define's from libgeda/include/defines.h
:100644 100644 624b016... 7c0e39d... M libgeda/include/defines.h
commit 692a7d38eac4800e355623fe9cbbbf4ffb7c412d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:59 2008 +0100
libgeda: Remove gtk header includes from libgeda.h and libgeda_priv.h
Libgeda doesn't use Gtk, only a small spattering of Gdk. Improve
cleanliness and compilation time by removing those header includes.
:100644 100644 613a6fd... 0a01eae... M libgeda/configure.ac.in
:100644 100644 492c78c... 3d1c941... M libgeda/include/geda_list.h
:100644 100644 1c477a0... 0c68617... M libgeda/include/libgeda.h
:100644 100644 741b606... 11c2dbd... M libgeda/include/libgeda_priv.h
:100644 100644 faff205... 185395b... M libgeda/src/o_picture.c
commit 80f19b131300110c67d332193959e33f230f0b1d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:59 2008 +0100
gschem: Create new include file, "gschem.h" to various gschem headers
:100644 100644 c893c6b... 8a1b981... M gschem/include/Makefile.am
:000000 100644 0000000... 6b936c0... A gschem/include/gschem.h
:100644 100644 4a82ab8... 88d3601... M gschem/src/a_pan.c
:100644 100644 39ec422... 654e379... M gschem/src/a_zoom.c
:100644 100644 a074251... 1f5ca1b... M gschem/src/g_funcs.c
:100644 100644 4a342c3... 55d9345... M gschem/src/g_hook.c
:100644 100644 46af29d... f1dee56... M gschem/src/g_keys.c
:100644 100644 e9cff5d... 1389d23... M gschem/src/g_rc.c
:100644 100644 f5fb451... acba0ed... M gschem/src/g_register.c
:100644 100644 1a489ef... a11e365... M gschem/src/globals.c
:100644 100644 047b9b6... 6d68bb4... M gschem/src/gschem.c
:100644 100644 7c8410f... 7eab719... M gschem/src/gschem_dialog.c
:100644 100644 8d0a0ba... 6ccac84... M gschem/src/gschem_toplevel.c
:100644 100644 2c43eb2... 95648fc... M gschem/src/i_basic.c
:100644 100644 b4f471b... 25431f6... M gschem/src/i_callbacks.c
:100644 100644 1fab055... fc043a3... M gschem/src/i_vars.c
:100644 100644 580b1ad... 07dc214... M gschem/src/o_arc.c
:100644 100644 fb817a3... c7fb8a1... M gschem/src/o_attrib.c
:100644 100644 61f997c... 212d700... M gschem/src/o_basic.c
:100644 100644 b2d95c4... c455d24... M gschem/src/o_box.c
:100644 100644 3ca1a56... eb02972... M gschem/src/o_buffer.c
:100644 100644 4144d48... 1551377... M gschem/src/o_bus.c
:100644 100644 9ad3735... 87d5e29... M gschem/src/o_circle.c
:100644 100644 ce7ba56... ea942c4... M gschem/src/o_complex.c
:100644 100644 aafa430... be36f7c... M gschem/src/o_copy.c
:100644 100644 5c545ce... 846c0c7... M gschem/src/o_cue.c
:100644 100644 d3e9ed2... c6a8188... M gschem/src/o_delete.c
:100644 100644 b060df2... 0087240... M gschem/src/o_find.c
:100644 100644 7ec9c01... a126741... M gschem/src/o_grips.c
:100644 100644 69c9f9a... 683b56e... M gschem/src/o_line.c
:100644 100644 2e94add... 3354474... M gschem/src/o_misc.c
:100644 100644 74e71c4... 4bd82c1... M gschem/src/o_move.c
:100644 100644 37e376a... 8fcec34... M gschem/src/o_net.c
:100644 100644 312724d... e5ae05e... M gschem/src/o_picture.c
:100644 100644 2ab1796... d9969ac... M gschem/src/o_pin.c
:100644 100644 6637baf... dc08567... M gschem/src/o_place.c
:100644 100644 ccf448a... ca152ab... M gschem/src/o_select.c
:100644 100644 353486e... bbcd2cc... M gschem/src/o_slot.c
:100644 100644 3b1677f... 861fa39... M gschem/src/o_text.c
:100644 100644 1e17e5a... be0ea3c... M gschem/src/o_undo.c
:100644 100644 c0888b8... 878e7d0... M gschem/src/parsecmd.c
:100644 100644 9446f32... 45c5203... M gschem/src/x_attribedit.c
:100644 100644 318e05e... 166142b... M gschem/src/x_autonumber.c
:100644 100644 92948a4... 77f2d4c... M gschem/src/x_basic.c
:100644 100644 754fcb1... eb51ec2... M gschem/src/x_color.c
:100644 100644 9050f73... 1217fe2... M gschem/src/x_compselect.c
:100644 100644 2578a39... 751fad3... M gschem/src/x_dialog.c
:100644 100644 604ac3b... ae62d8f... M gschem/src/x_event.c
:100644 100644 bdf8188... 09aa756... M gschem/src/x_fileselect.c
:100644 100644 8074bc1... fa9e3fb... M gschem/src/x_grid.c
:100644 100644 d8dcb30... c8338d7... M gschem/src/x_image.c
:100644 100644 ac2b6b2... 5265686... M gschem/src/x_log.c
:100644 100644 0af0f3b... 2dccfcd... M gschem/src/x_menus.c
:100644 100644 a858cf4... f0910cd... M gschem/src/x_multiattrib.c
:100644 100644 ef29a6e... 2107747... M gschem/src/x_pagesel.c
:100644 100644 dadd040... b8fa521... M gschem/src/x_preview.c
:100644 100644 7523ebd... 36888d4... M gschem/src/x_print.c
:100644 100644 c1508e1... 38c1de4... M gschem/src/x_script.c
:100644 100644 fe247a8... 08da5f1... M gschem/src/x_stroke.c
:100644 100644 a9aeba4... c5598e2... M gschem/src/x_window.c
commit a27996354d61af13a4f0a1eed2db4b979b7f148f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:59 2008 +0100
gschem: Pass GTK's CFLAGS into GSCHEM_CFLAGS. Don't rely on LIBGEDA_CFLAGS
libgeda really shouldn't be pulling in GTK, so we need to do it properly
ourselves.
:100644 100644 7bc370f... cc22235... M gschem/configure.ac.in
commit 2e87904a34cd5ad58bc8a9511dd5915adf9df405
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:58 2008 +0100
libgeda: Rename gtk_[outline_]color variables gdk_... to their types
Also added NULL initaliser for gdk_outline_color which was missing.
:100644 100644 aa51d14... 754fcb1... M gschem/src/x_color.c
:100644 100644 6f16d0e... 51701ba... M libgeda/include/struct.h
:100644 100644 6bf85f6... 3cbdca7... M libgeda/src/s_color.c
=========
Changes
=========
commit 1bfa2bacae85a59758c6b6ddb16bc62362b9ac7e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:48:00 2008 +0100
gschem: Add #define LAST_DRAWB_MODE_NONE -1
This flag will be used to indicate that the bounding box was not drawn
onto the page at all yet.
diff --git a/gschem/include/gschem_defines.h b/gschem/include/gschem_defines.h
index 6337cf3..c190518 100644
--- a/gschem/include/gschem_defines.h
+++ b/gschem/include/gschem_defines.h
@@ -69,6 +69,11 @@
#define OUTLINE 0
#define BOUNDINGBOX 1
+/* This is an additional mode for last_drawb_mode, to indicate there was no
+ * last bounding box drawn. last_drawb_mode also takes actionfeedback_mode
+ * constants, so be sure not to clash with those */
+#define LAST_DRAWB_MODE_NONE -1
+
/* there are modes for text-feedback */
#define ONLY_WHEN_READABLE 0
#define ALWAYS 1
diff --git a/gschem/src/gschem_toplevel.c b/gschem/src/gschem_toplevel.c
index 6ccac84..d3f8b3e 100644
--- a/gschem/src/gschem_toplevel.c
+++ b/gschem/src/gschem_toplevel.c
@@ -133,7 +133,7 @@ GSCHEM_TOPLEVEL *gschem_toplevel_new ()
w_current->text_alignment = 0;
w_current->inside_redraw = 0;
w_current->drawbounding_action_mode = FREE;
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
w_current->CONTROLKEY = 0;
w_current->SHIFTKEY = 0;
w_current->ALTKEY = 0;
diff --git a/gschem/src/o_buffer.c b/gschem/src/o_buffer.c
index eb02972..2059e63 100644
--- a/gschem/src/o_buffer.c
+++ b/gschem/src/o_buffer.c
@@ -102,7 +102,7 @@ void o_buffer_paste_start(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y,
return;
}
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* remove the old place list if it exists */
s_delete_object_glist(toplevel, toplevel->page_current->place_list);
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index a126741..c648865 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -560,7 +560,7 @@ int o_grips_start(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
void o_grips_start_arc(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
int x, int y, int whichone)
{
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* erase the arc before */
o_erase_single(w_current, o_current);
@@ -604,7 +604,7 @@ void o_grips_start_arc(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
void o_grips_start_box(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
int x, int y, int whichone)
{
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* erase the box before */
o_erase_single(w_current, o_current);
@@ -670,7 +670,7 @@ void o_grips_start_box(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
void o_grips_start_picture(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
int x, int y, int whichone)
{
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* erase the picture before */
o_erase_single(w_current, o_current);
@@ -739,7 +739,7 @@ void o_grips_start_circle(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
int x, int y, int whichone)
{
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* erase the circle before */
o_erase_single(w_current, o_current);
@@ -777,7 +777,7 @@ void o_grips_start_circle(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
void o_grips_start_line(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current,
int x, int y, int whichone)
{
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* erase the line before */
o_erase_single(w_current, o_current);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 4bd82c1..1043614 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -42,7 +42,7 @@ void o_move_start(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
/* Save the current state. When rotating the selection when moving,
we have to come back to here */
o_undo_savestate(w_current, UNDO_ALL);
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
w_current->event_state = MOVE;
w_current->first_wx = w_current->second_wx = w_x;
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index 861fa39..cc66b18 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -283,7 +283,7 @@ void o_text_prepare_place(GSCHEM_TOPLEVEL *w_current, char *text)
w_current->first_wx = 0;
w_current->first_wy = 0;
- w_current->last_drawb_mode = -1;
+ w_current->last_drawb_mode = LAST_DRAWB_MODE_NONE;
/* remove the old place list if it exists */
s_delete_object_glist(toplevel, toplevel->page_current->place_list);
commit 288d9e67af83f03534398319d0e8ad16fa631fb0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:48:00 2008 +0100
Move gschem defines from libgeda into gschem/include/gschem_defines.h
Whilst we're at it, remove some unused definitions.
diff --git a/gschem/include/gschem.h b/gschem/include/gschem.h
index 6b936c0..b5180b7 100644
--- a/gschem/include/gschem.h
+++ b/gschem/include/gschem.h
@@ -5,6 +5,7 @@
#include <libgeda/libgeda.h>
/* gschem headers */
+#include "gschem_defines.h"
#include "gschem_struct.h"
#include "gschem_dialog.h"
#include "i_vars.h"
diff --git a/gschem/include/gschem_defines.h b/gschem/include/gschem_defines.h
new file mode 100644
index 0000000..6337cf3
--- /dev/null
+++ b/gschem/include/gschem_defines.h
@@ -0,0 +1,124 @@
+/* gEDA - GPL Electronic Design Automation
+ * gschem - gEDA Schematic Capture
+ * Copyright (C) 1998-2008 Ales V. Hvezda
+ * Copyright (C) 1998-2008 gEDA Contributors (see ChangeLog for details)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library 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.
+ */
+
+#ifndef _GSCHEM_DEFINES_H_INCL
+#define _GSCHEM_DEFINES_H_INCL
+
+#define ZOOM_OUT 0
+#define ZOOM_IN 1
+#define ZOOM_FULL 2
+
+/* For grip size */
+#define GRIP_SIZE1 25
+#define GRIP_SIZE2 50
+#define GRIP_SIZE3 80
+#define SMALL_ZOOMFACTOR1 150
+#define SMALL_ZOOMFACTOR2 30
+
+/* for bus_ripper_type */
+#define COMP_BUS_RIPPER 0
+#define NET_BUS_RIPPER 1
+
+/* for bus_ripper_rotation */
+#define SYMMETRIC 0
+#define NON_SYMMETRIC 1
+
+#define FREE 1
+#define CONSTRAINED 2
+
+/* for attrib_edit_dialog invocation flag */
+#define FROM_MENU 0
+#define FROM_HOTKEY 1
+
+/* for text cap style */
+#define LOWER 0
+#define UPPER 1
+#define BOTH 2
+
+/* These modes are for net_endpoint_mode */
+#define NONE 0
+#define FILLEDBOX 1
+#define EMPTYBOX 2
+#define X 3
+
+/* These modes are for net_midpoint_mode */
+/* NONE also applies here */
+#define FILLED 3
+#define EMPTY 4
+
+/* These modes are for actionfeedback_mode */
+/* there's a hack in i_keypress.c dealing with the 0 and 1 (has to be these */
+/* values */
+#define OUTLINE 0
+#define BOUNDINGBOX 1
+
+/* there are modes for text-feedback */
+#define ONLY_WHEN_READABLE 0
+#define ALWAYS 1
+
+/* used in o_undo_callback */
+#define UNDO_ACTION 0
+#define REDO_ACTION 1
+
+/* used for undo_type */
+#define UNDO_DISK 0
+#define UNDO_MEMORY 1
+
+/* selection types */
+/* used in o_select_object */
+#define SINGLE 0
+#define MULTIPLE 1
+
+/* for grid_mode */
+#define GRID_VARIABLE_MODE 0
+#define GRID_FIXED_MODE 1
+
+/* for log-window keyword */
+#define MAP_LATER 0
+#define MAP_ON_STARTUP 1
+
+/* for log-window-type */
+#define DECORATED 0
+#define TRANSIENT 1
+
+/* for third-mouse */
+#define POPUP_ENABLED 0
+#define MOUSEPAN_ENABLED 1
+
+/* for middle-mouse */
+#define STROKE 0
+#define REPEAT 1
+#define ACTION 2
+#define MID_MOUSEPAN_ENABLED 3
+
+/* for scroll-wheel */
+#define SCROLL_WHEEL_CLASSIC 0
+#define SCROLL_WHEEL_GTK 1
+
+/* for selected_from */
+#define DONTCARE 0
+#define MENU 1
+#define HOTKEY 2
+
+/* for a_pan_general and a_zoom */
+#define A_PAN_IGNORE_BORDERS 1
+#define A_PAN_DONT_REDRAW 2
+
+#endif /* !_GSCHEM_DEFINES_H_INCL */
diff --git a/libgeda/include/defines.h b/libgeda/include/defines.h
index 7c0e39d..9572f2c 100644
--- a/libgeda/include/defines.h
+++ b/libgeda/include/defines.h
@@ -44,10 +44,6 @@
/* for color mechanism used in gschem */
#define MAX_COLORS 25
-#define ZOOM_OUT 0
-#define ZOOM_IN 1
-#define ZOOM_FULL 2
-
/* X's obsession with *64 */
#define FULL_CIRCLE 360*64
@@ -77,39 +73,16 @@
#define CUE_CIRCLE_SMALL_SIZE 30
#define CUE_CIRCLE_LARGE_SIZE 60
-/* For grip size */
-#define GRIP_SIZE1 25
-#define GRIP_SIZE2 50
-#define GRIP_SIZE3 80
-#define SMALL_ZOOMFACTOR1 150
-#define SMALL_ZOOMFACTOR2 30
-
-
/* For text location on component not found graphics */
#define NOT_FOUND_TEXT_X 100
#define NOT_FOUND_TEXT_Y 100
-/* for bus_ripper_type */
-#define COMP_BUS_RIPPER 0
-#define NET_BUS_RIPPER 1
-
-/* for bus_ripper_rotation */
-#define SYMMETRIC 0
-#define NON_SYMMETRIC 1
-
#undef max
#define max(a,b) ((a) > (b) ? (a) : (b))
#undef min
#define min(a,b) ((a) < (b) ? (a) : (b))
-#define FREE 1
-#define CONSTRAINED 2
-
-/* for attrib_edit_dialog invocation flag */
-#define FROM_MENU 0
-#define FROM_HOTKEY 1
-
/* for s_clib_getfilename() */
#define OPEN_DIR 0
#define READ_DIR 1
@@ -121,11 +94,6 @@
#define SLIB_SEARCH_NEXT 1
#define SLIB_SEARCH_DONE 2
-/* for text cap style */
-#define LOWER 0
-#define UPPER 1
-#define BOTH 2
-
/* for text alignment */
/* 2 -- 5 -- 8 */
/* | | | */
@@ -149,18 +117,6 @@
/* multi text line spacing (multipled times character height) */
#define LINE_SPACING 2.0
-/* These modes are for net_endpoint_mode */
-#define NONE 0
-#define FILLEDBOX 1
-#define EMPTYBOX 2
-#define X 3
-
-/* These modes are for net_midpoint_mode */
-/* NONE also applies here */
-#define FILLED 3
-#define EMPTY 4
-
-
/* The conn modes for type */
#define CONN_NULL 0
#define CONN_ENDPOINT 1
@@ -170,25 +126,6 @@
#define MAX_TILES_X 10
#define MAX_TILES_Y 10
-/* These modes are for actionfeedback_mode */
-/* there's a hack in i_keypress.c dealing with the 0 and 1 (has to be these */
-/* values */
-#define OUTLINE 0
-#define BOUNDINGBOX 1
-
-
-/* there are modes for text-feedback */
-#define ONLY_WHEN_READABLE 0
-#define ALWAYS 1
-
-/* used in o_undo_callback */
-#define UNDO_ACTION 0
-#define REDO_ACTION 1
-
-/* used for undo_type */
-#define UNDO_DISK 0
-#define UNDO_MEMORY 1
-
/* used for undo_savestate flag */
#define UNDO_ALL 0
#define UNDO_VIEWPORT_ONLY 1
@@ -211,21 +148,12 @@
#define HIERARCHY_POSTORDER (1<<1)
#define HIERARCHY_INNERLOOP (1<<7)
-/* selection types */
-/* used in o_select_object */
-#define SINGLE 0
-#define MULTIPLE 1
-
#define MILS_PER_INCH 1000
/* for text_output */
#define VECTOR_FONTS 0
#define PS_FONTS 1
-/* for grid_mode */
-#define GRID_VARIABLE_MODE 0
-#define GRID_FIXED_MODE 1
-
/* for print dialog box */
#define EXTENTS 0
#define WINDOW 1
@@ -244,37 +172,6 @@
#define POSTSCRIPT 0
#define PNG 1
-/* for log-window keyword */
-#define MAP_LATER 0
-#define MAP_ON_STARTUP 1
-
-/* for log-window-type */
-#define DECORATED 0
-#define TRANSIENT 1
-
-/* for third-mouse */
-#define POPUP_ENABLED 0
-#define MOUSEPAN_ENABLED 1
-
-/* for middle-mouse */
-#define STROKE 0
-#define REPEAT 1
-#define ACTION 2
-#define MID_MOUSEPAN_ENABLED 3
-
-/* for scroll-wheel */
-#define SCROLL_WHEEL_CLASSIC 0
-#define SCROLL_WHEEL_GTK 1
-
-/* for selected_from */
-#define DONTCARE 0
-#define MENU 1
-#define HOTKEY 2
-
-/* for a_pan_general and a_zoom */
-#define A_PAN_IGNORE_BORDERS 1
-#define A_PAN_DONT_REDRAW 2
-
/* for o_net_orientation */
#define NEITHER 0
#define HORIZONTAL 1
commit 51843b80f3ab5b2d5f0a3cb52bb09b9001ae80ae
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:48:00 2008 +0100
libgeda: Delete unused #define's from libgeda/include/defines.h
diff --git a/libgeda/include/defines.h b/libgeda/include/defines.h
index 624b016..7c0e39d 100644
--- a/libgeda/include/defines.h
+++ b/libgeda/include/defines.h
@@ -44,23 +44,10 @@
/* for color mechanism used in gschem */
#define MAX_COLORS 25
-/* for new fileselection dialog box */
-#define MAX_FILES 2048
-#define MAX_DIRS 2048
-
#define ZOOM_OUT 0
#define ZOOM_IN 1
#define ZOOM_FULL 2
-#define CONNECTION_NONE 0 /* this one is not used */
-#define CONNECTION_REGULAR 1
-#define CONNECTION_ROUND 2
-
-#if 0 /* Comment this in if you don't have gtk 1.0.4 or greater */
-#define TRUE 1
-#define FALSE 0
-#endif
-
/* X's obsession with *64 */
#define FULL_CIRCLE 360*64
@@ -155,9 +142,6 @@
#define MIDDLE_RIGHT 7
#define UPPER_RIGHT 8
-/* maximum single line length when reading in text strings */
-#define MAX_TEXT_LINE_LENGTH 1024
-
/* one character string used to calculate tab's width */
/* Warning: it MUST be a string. */
#define TAB_CHAR_MODEL "b"
@@ -182,21 +166,6 @@
#define CONN_ENDPOINT 1
#define CONN_MIDPOINT 2
-/* The conn whole type */
-#define NO_MIDPOINT 0
-#define HAS_MIDPOINT 1
-#define HAS_BUS_MIDPOINT 2
-
-/* The conn modes for visual_cue */
-#define NO_CUE 1
-#define NET_DANGLING_CUE 2
-#define PIN_DANGLING_CUE 3
-#define BUS_DANGLING_CUE 4
-#define MIDPOINT_CUE 5
-#define BUS_MIDPOINT_CUE 6
-#define INVALID_CUE 7
-
-
/* used by world_tiles to set the size of the array */
#define MAX_TILES_X 10
#define MAX_TILES_Y 10
commit 692a7d38eac4800e355623fe9cbbbf4ffb7c412d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:59 2008 +0100
libgeda: Remove gtk header includes from libgeda.h and libgeda_priv.h
Libgeda doesn't use Gtk, only a small spattering of Gdk. Improve
cleanliness and compilation time by removing those header includes.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 613a6fd..0a01eae 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -174,62 +174,44 @@ fi
############################################################################
############################################################################
-# Check for gtk+ 2.4 start
-#
+# Check for pkg-config start
+#
# Check for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test $PKG_CONFIG = no; then
- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+ AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
fi
-PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
-
-# This next bit of code figures out what gtk we need to use.
-if test "$GTK24" = "yes"
-then
+#
+# Check for pkg-config end
+############################################################################
- AC_DEFINE(HAS_GTK24, 1, [If gtk+ 2.4.x has been installed, define this])
- GTK_CFLAGS=$GTK24_CFLAGS
- GTK_LIBS=$GTK24_LIBS
- GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
+############################################################################
+# Check for glib 2.4 start
+#
- # Search for glib
- PKG_CHECK_MODULES(GLIB24, glib-2.0 >= 2.4.0, GLIB24="yes", no_GLIB24="yes")
- if test "$GLIB24" != "yes"
- then
- AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.
+# Search for glib
+PKG_CHECK_MODULES(GLIB24, glib-2.0 >= 2.4.0, GLIB24="yes", no_GLIB24="yes")
+if test "$GLIB24" != "yes"
+then
+ AC_MSG_ERROR([Cannot find glib 2.4.x, install it and rerun ./configure.
You may find the following error output (if any) useful:
$GLIB24_PKG_ERRORS
])
- fi
- GLIB_CFLAGS=$GLIB24_CFLAGS
- GLIB_LIBS=$GLIB24_LIBS
- GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
-
-else
- GTK_VERSION=""
-fi
-
-if test "$GTK_VERSION" = ""
-then
- AC_MSG_ERROR([Cannot find gtk+ 2.4.x or later, please install gtk+.])
fi
+GLIB_CFLAGS=$GLIB24_CFLAGS
+GLIB_LIBS=$GLIB24_LIBS
+GLIB_VERSION=`$PKG_CONFIG glib-2.0 --modversion`
#
-# Check for gtk+ 2.4 end
+# Check for glib 2.4 end
############################################################################
############################################################################
# Check for gdk 2.4 or later
#
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
PKG_CHECK_MODULES(GDK, gdk-2.0 >= 2.4.0, GDK="yes", no_GDK="yes")
# This next bit of code figures out what gtk we need to use.
@@ -256,12 +238,6 @@ fi
# Check for gdk-pixbuf
#
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
- AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 0.15.0, GDK_PIXBUF="yes", no_GDK_PIXBUF="yes")
# This next bit of code figures out what gtk we need to use.
@@ -492,7 +468,7 @@ fi
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GTK_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS $GDK_CFLAGS"
+LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GLIB_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS $GDK_CFLAGS"
LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS $GDK_LIBS"
LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION"
@@ -534,9 +510,9 @@ AC_MSG_RESULT([
** Configuration summary for $PACKAGE $DOTTED_VERSION.$DATE_VERSION
GLIB library version: $GLIB_VERSION
- GTK+ library version: $GTK_VERSION
- GUILE library version: $GUILE_VERSION
+ GDK library version: $GDK_VERSION
GDK-PIXBUF (png output): $GDK_PIXBUF_VERSION
+ GUILE library version: $GUILE_VERSION
mingw build: $MINGW
data directory: $expandedGEDADATADIR
rc directory: $expandedGEDARCDIR
diff --git a/libgeda/include/geda_list.h b/libgeda/include/geda_list.h
index 492c78c..3d1c941 100644
--- a/libgeda/include/geda_list.h
+++ b/libgeda/include/geda_list.h
@@ -22,7 +22,6 @@
#ifndef __GEDA_LIST_H__
#define __GEDA_LIST_H__
-
#define GEDA_TYPE_LIST (geda_list_get_type())
#define GEDA_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GEDA_TYPE_LIST, GedaList))
#define GEDA_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GEDA_TYPE_LIST, GedaListClass))
diff --git a/libgeda/include/libgeda.h b/libgeda/include/libgeda.h
index 1c477a0..0c68617 100644
--- a/libgeda/include/libgeda.h
+++ b/libgeda/include/libgeda.h
@@ -20,7 +20,6 @@
#ifndef LIBGEDA_H
#define LIBGEDA_H
-#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <glib.h>
diff --git a/libgeda/include/libgeda_priv.h b/libgeda/include/libgeda_priv.h
index 741b606..11c2dbd 100644
--- a/libgeda/include/libgeda_priv.h
+++ b/libgeda/include/libgeda_priv.h
@@ -1,6 +1,7 @@
/* System headers which libgeda headers rely on */
#include <glib.h>
-#include <gtk/gtk.h> /* FIXME */
+#include <glib-object.h>
+#include <gdk/gdk.h>
#include <libguile.h>
#include "guile_compat_1.6.h"
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index faff205..185395b 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -30,7 +30,6 @@
#include <libgen.h>
#endif
-#include <gtk/gtk.h>
#include <guile/gh.h>
#include <gdk/gdk.h>
commit 80f19b131300110c67d332193959e33f230f0b1d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:59 2008 +0100
gschem: Create new include file, "gschem.h" to various gschem headers
diff --git a/gschem/include/Makefile.am b/gschem/include/Makefile.am
index c893c6b..8a1b981 100644
--- a/gschem/include/Makefile.am
+++ b/gschem/include/Makefile.am
@@ -7,6 +7,7 @@ noinst_HEADERS = \
gettext.h \
x_compselect.h \
x_log.h x_multiattrib.h x_pagesel.h x_print.h x_preview.h \
+ gschem.h \
gschem_dialog.h \
gschem_struct.h
diff --git a/gschem/include/gschem.h b/gschem/include/gschem.h
new file mode 100644
index 0000000..6b936c0
--- /dev/null
+++ b/gschem/include/gschem.h
@@ -0,0 +1,23 @@
+/* System headers which gschem headers rely on */
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <libguile.h>
+#include <libgeda/libgeda.h>
+
+/* gschem headers */
+#include "gschem_struct.h"
+#include "gschem_dialog.h"
+#include "i_vars.h"
+#include "x_preview.h"
+#include "x_compselect.h"
+#include "x_dialog.h"
+#include "x_log.h"
+#include "x_multiattrib.h"
+#include "x_pagesel.h"
+#include "x_print.h"
+#include "x_states.h"
+#include "globals.h"
+#include "prototype.h"
+
+/* Gettext translation */
+#include "gettext.h"
diff --git a/gschem/src/a_pan.c b/gschem/src/a_pan.c
index 4a82ab8..88d3601 100644
--- a/gschem/src/a_pan.c
+++ b/gschem/src/a_pan.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/a_zoom.c b/gschem/src/a_zoom.c
index 39ec422..654e379 100644
--- a/gschem/src/a_zoom.c
+++ b/gschem/src/a_zoom.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/g_funcs.c b/gschem/src/g_funcs.c
index a074251..1f5ca1b 100644
--- a/gschem/src/g_funcs.c
+++ b/gschem/src/g_funcs.c
@@ -32,12 +32,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/x_dialog.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/g_hook.c b/gschem/src/g_hook.c
index 4a342c3..55d9345 100644
--- a/gschem/src/g_hook.c
+++ b/gschem/src/g_hook.c
@@ -24,11 +24,7 @@
#endif
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/g_keys.c b/gschem/src/g_keys.c
index 46af29d..f1dee56 100644
--- a/gschem/src/g_keys.c
+++ b/gschem/src/g_keys.c
@@ -32,11 +32,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/g_rc.c b/gschem/src/g_rc.c
index e9cff5d..1389d23 100644
--- a/gschem/src/g_rc.c
+++ b/gschem/src/g_rc.c
@@ -35,12 +35,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/i_vars.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/g_register.c b/gschem/src/g_register.c
index f5fb451..acba0ed 100644
--- a/gschem/src/g_register.c
+++ b/gschem/src/g_register.c
@@ -31,11 +31,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/globals.c b/gschem/src/globals.c
index 1a489ef..a11e365 100644
--- a/gschem/src/globals.c
+++ b/gschem/src/globals.c
@@ -23,11 +23,7 @@
#include <config.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c
index 047b9b6..6d68bb4 100644
--- a/gschem/src/gschem.c
+++ b/gschem/src/gschem.c
@@ -29,12 +29,7 @@
#include <glib.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/i_vars.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/gschem_dialog.c b/gschem/src/gschem_dialog.c
index 7c8410f..7eab719 100644
--- a/gschem/src/gschem_dialog.c
+++ b/gschem/src/gschem_dialog.c
@@ -26,14 +26,9 @@
#include <glib/gstdio.h>
#endif
-#include <libgeda/libgeda.h>
-#include <gtk/gtk.h>
+#include "gschem.h"
#include <gdk/gdkkeysyms.h>
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
diff --git a/gschem/src/gschem_toplevel.c b/gschem/src/gschem_toplevel.c
index 8d0a0ba..6ccac84 100644
--- a/gschem/src/gschem_toplevel.c
+++ b/gschem/src/gschem_toplevel.c
@@ -19,10 +19,7 @@
*/
#include <config.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
+#include "gschem.h"
GSCHEM_TOPLEVEL *gschem_toplevel_new ()
{
diff --git a/gschem/src/i_basic.c b/gschem/src/i_basic.c
index 2c43eb2..95648fc 100644
--- a/gschem/src/i_basic.c
+++ b/gschem/src/i_basic.c
@@ -23,11 +23,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index b4f471b..25431f6 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -27,11 +27,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/i_vars.c b/gschem/src/i_vars.c
index 1fab055..fc043a3 100644
--- a/gschem/src/i_vars.c
+++ b/gschem/src/i_vars.c
@@ -20,11 +20,7 @@
#include <config.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index 580b1ad..07dc214 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -21,11 +21,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index fb817a3..c7fb8a1 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -25,11 +25,7 @@
#endif
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 61f997c..212d700 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -20,11 +20,7 @@
#include <config.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index b2d95c4..c455d24 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -21,11 +21,7 @@
#include <math.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_buffer.c b/gschem/src/o_buffer.c
index 3ca1a56..eb02972 100644
--- a/gschem/src/o_buffer.c
+++ b/gschem/src/o_buffer.c
@@ -20,11 +20,7 @@
#include <config.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 4144d48..1551377 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -21,11 +21,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index 9ad3735..87d5e29 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -21,11 +21,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index ce7ba56..ea942c4 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -25,11 +25,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_copy.c b/gschem/src/o_copy.c
index aafa430..be36f7c 100644
--- a/gschem/src/o_copy.c
+++ b/gschem/src/o_copy.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <string.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_cue.c b/gschem/src/o_cue.c
index 5c545ce..846c0c7 100644
--- a/gschem/src/o_cue.c
+++ b/gschem/src/o_cue.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <string.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_delete.c b/gschem/src/o_delete.c
index d3e9ed2..c6a8188 100644
--- a/gschem/src/o_delete.c
+++ b/gschem/src/o_delete.c
@@ -21,11 +21,7 @@
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_find.c b/gschem/src/o_find.c
index b060df2..0087240 100644
--- a/gschem/src/o_find.c
+++ b/gschem/src/o_find.c
@@ -22,11 +22,7 @@
#include <math.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 7ec9c01..a126741 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 69c9f9a..683b56e 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 2e94add..3354474 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -30,11 +30,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 74e71c4..4bd82c1 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -21,11 +21,7 @@
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 37e376a..8fcec34 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 312724d..e5ae05e 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -21,11 +21,7 @@
#include <math.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
/* This works, but using one macro inside of other doesn't */
#define GET_PICTURE_WIDTH(w) \
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 2ab1796..d9969ac 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -22,12 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_place.c b/gschem/src/o_place.c
index 6637baf..dc08567 100644
--- a/gschem/src/o_place.c
+++ b/gschem/src/o_place.c
@@ -20,11 +20,7 @@
#include <config.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index ccf448a..ca152ab 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -33,12 +33,7 @@
#include <math.h>
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_slot.c b/gschem/src/o_slot.c
index 353486e..bbcd2cc 100644
--- a/gschem/src/o_slot.c
+++ b/gschem/src/o_slot.c
@@ -24,11 +24,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index 3b1677f..861fa39 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -29,11 +29,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/o_undo.c b/gschem/src/o_undo.c
index 1e17e5a..be0ea3c 100644
--- a/gschem/src/o_undo.c
+++ b/gschem/src/o_undo.c
@@ -28,11 +28,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/parsecmd.c b/gschem/src/parsecmd.c
index c0888b8..878e7d0 100644
--- a/gschem/src/parsecmd.c
+++ b/gschem/src/parsecmd.c
@@ -24,11 +24,7 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index 9446f32..45c5203 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -29,14 +29,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/i_vars.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/gschem_dialog.h"
-#include "../include/x_dialog.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_autonumber.c b/gschem/src/x_autonumber.c
index 318e05e..166142b 100644
--- a/gschem/src/x_autonumber.c
+++ b/gschem/src/x_autonumber.c
@@ -29,16 +29,9 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
+#include "gschem.h"
#include <gdk/gdkkeysyms.h>
-#include "../include/gschem_struct.h"
-#include "../include/i_vars.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/gschem_dialog.h"
-#include "../include/x_dialog.h"
-
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
diff --git a/gschem/src/x_basic.c b/gschem/src/x_basic.c
index 92948a4..77f2d4c 100644
--- a/gschem/src/x_basic.c
+++ b/gschem/src/x_basic.c
@@ -22,11 +22,7 @@
#include <stdio.h>
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_color.c b/gschem/src/x_color.c
index 754fcb1..eb51ec2 100644
--- a/gschem/src/x_color.c
+++ b/gschem/src/x_color.c
@@ -25,11 +25,7 @@
#endif
#include <math.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index 9050f73..1217fe2 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -36,14 +36,9 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-#include <gtk/gtk.h>
+#include "gschem.h"
#include <gdk/gdkkeysyms.h>
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index 2578a39..751fad3 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -28,14 +28,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/i_vars.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/x_dialog.h"
-#include "../include/gschem_dialog.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 604ac3b..ae62d8f 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -25,11 +25,7 @@
#include <stdlib.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_fileselect.c b/gschem/src/x_fileselect.c
index bdf8188..09aa756 100644
--- a/gschem/src/x_fileselect.c
+++ b/gschem/src/x_fileselect.c
@@ -19,18 +19,12 @@
*/
#include <config.h>
+#include "gschem.h"
+
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
-#include <libgeda/libgeda.h>
-#include <gtk/gtk.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/x_preview.h"
-
/*! \brief Creates filter for file chooser.
* \par Function Description
diff --git a/gschem/src/x_grid.c b/gschem/src/x_grid.c
index 8074bc1..fa9e3fb 100644
--- a/gschem/src/x_grid.c
+++ b/gschem/src/x_grid.c
@@ -24,11 +24,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_image.c b/gschem/src/x_image.c
index d8dcb30..c8338d7 100644
--- a/gschem/src/x_image.c
+++ b/gschem/src/x_image.c
@@ -30,12 +30,7 @@
#include <glib.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/x_dialog.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_log.c b/gschem/src/x_log.c
index ac2b6b2..5265686 100644
--- a/gschem/src/x_log.c
+++ b/gschem/src/x_log.c
@@ -35,19 +35,12 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
-#include "../include/gschem_dialog.h"
-#include "../include/x_log.h"
-
static void x_log_callback_response (GtkDialog *dialog,
gint arg1,
gpointer user_data);
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 0af0f3b..2dccfcd 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -24,11 +24,7 @@
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#if GLIB_CHECK_VERSION(2,6,0)
#include <glib/gstdio.h>
diff --git a/gschem/src/x_multiattrib.c b/gschem/src/x_multiattrib.c
index a858cf4..f0910cd 100644
--- a/gschem/src/x_multiattrib.c
+++ b/gschem/src/x_multiattrib.c
@@ -27,20 +27,13 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/i_vars.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
+#include <gdk/gdkkeysyms.h>
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
-#include <gdk/gdkkeysyms.h>
-#include "../include/gschem_dialog.h"
-#include "../include/x_multiattrib.h"
/*! \brief Update the multiattrib editor dialog when the page's
* selection changes.
diff --git a/gschem/src/x_pagesel.c b/gschem/src/x_pagesel.c
index ef29a6e..2107747 100644
--- a/gschem/src/x_pagesel.c
+++ b/gschem/src/x_pagesel.c
@@ -27,19 +27,12 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
-#include "../include/gschem_dialog.h"
-#include "../include/x_pagesel.h"
-
static void x_pagesel_callback_response (GtkDialog *dialog,
gint arg1,
diff --git a/gschem/src/x_preview.c b/gschem/src/x_preview.c
index dadd040..b8fa521 100644
--- a/gschem/src/x_preview.c
+++ b/gschem/src/x_preview.c
@@ -30,18 +30,12 @@
#include <unistd.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
-#include "../include/x_preview.h"
-
#define OVER_ZOOM_FACTOR 0.1
diff --git a/gschem/src/x_print.c b/gschem/src/x_print.c
index 7523ebd..36888d4 100644
--- a/gschem/src/x_print.c
+++ b/gschem/src/x_print.c
@@ -27,13 +27,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
-#include "../include/gschem_dialog.h"
-#include "../include/x_print.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_script.c b/gschem/src/x_script.c
index c1508e1..38c1de4 100644
--- a/gschem/src/x_script.c
+++ b/gschem/src/x_script.c
@@ -28,11 +28,7 @@
#include <string.h>
#endif
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
diff --git a/gschem/src/x_stroke.c b/gschem/src/x_stroke.c
index fe247a8..08da5f1 100644
--- a/gschem/src/x_stroke.c
+++ b/gschem/src/x_stroke.c
@@ -19,19 +19,15 @@
*/
#include <config.h>
-#include <libgeda/libgeda.h>
+#include "gschem.h"
-#include "../include/gschem_struct.h"
-#include "../include/x_states.h"
-#include "../include/prototype.h"
+#ifdef HAS_LIBSTROKE
+#include <stroke.h>
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
-#ifdef HAS_LIBSTROKE
-#include <stroke.h>
-
/*
* <B>stroke_points</B> is an array of points for the stroke
* footprints. The points of the stroke are displayed over the display
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index a9aeba4..c5598e2 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -21,12 +21,7 @@
#include <stdio.h>
-#include <libgeda/libgeda.h>
-
-#include "../include/gschem_struct.h"
-#include "../include/i_vars.h"
-#include "../include/globals.h"
-#include "../include/prototype.h"
+#include "gschem.h"
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
commit a27996354d61af13a4f0a1eed2db4b979b7f148f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:59 2008 +0100
gschem: Pass GTK's CFLAGS into GSCHEM_CFLAGS. Don't rely on LIBGEDA_CFLAGS
libgeda really shouldn't be pulling in GTK, so we need to do it properly
ourselves.
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 7bc370f..cc22235 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -565,7 +565,7 @@ AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
#AM_GLIB_GNU_GETTEXT
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GSCHEM_CFLAGS="$LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS"
+GSCHEM_CFLAGS="$LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS"
GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GTK_LIBS $X_LDFLAGS $DMALLOC_LIBS $GTHREAD_LIBS"
# Makefile.in variable substitution
commit 2e87904a34cd5ad58bc8a9511dd5915adf9df405
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sat Aug 16 15:47:58 2008 +0100
libgeda: Rename gtk_[outline_]color variables gdk_... to their types
Also added NULL initaliser for gdk_outline_color which was missing.
diff --git a/gschem/src/x_color.c b/gschem/src/x_color.c
index aa51d14..754fcb1 100644
--- a/gschem/src/x_color.c
+++ b/gschem/src/x_color.c
@@ -96,11 +96,11 @@ static void x_color_allocate_all(void)
for (i = 0; i < MAX_COLORS; i++) {
if (colors[i].color_name) {
- colors[i].gtk_color = (GdkColor *)
+ colors[i].gdk_color = (GdkColor *)
g_malloc(sizeof(GdkColor));
error = gdk_color_parse(colors[i].color_name,
- colors[i].gtk_color);
+ colors[i].gdk_color);
if (error == FALSE) {
fprintf(stderr,
@@ -110,7 +110,7 @@ static void x_color_allocate_all(void)
_("Defaulting color to white\n"));
error = gdk_color_parse("white",
- colors[i].gtk_color);
+ colors[i].gdk_color);
if (error == FALSE) {
fprintf(stderr,
@@ -121,7 +121,7 @@ static void x_color_allocate_all(void)
}
- error = gdk_color_alloc(colormap, colors[i].gtk_color);
+ error = gdk_color_alloc(colormap, colors[i].gdk_color);
if (error == FALSE) {
fprintf(stderr,
@@ -133,11 +133,11 @@ static void x_color_allocate_all(void)
}
if (colors[i].outline_color_name) {
- colors[i].gtk_outline_color = (GdkColor *)
+ colors[i].gdk_outline_color = (GdkColor *)
g_malloc(sizeof(GdkColor));
error = gdk_color_parse(colors[i].outline_color_name,
- colors[i].gtk_outline_color);
+ colors[i].gdk_outline_color);
if (error == FALSE) {
fprintf(stderr,
@@ -147,7 +147,7 @@ static void x_color_allocate_all(void)
_("Defaulting color to white\n"));
error = gdk_color_parse("white",
- colors[i].gtk_outline_color);
+ colors[i].gdk_outline_color);
if (error == FALSE) {
fprintf(stderr,
@@ -159,17 +159,17 @@ static void x_color_allocate_all(void)
/* Make sure the outline color is correct for non-black backgrounds */
if (i > 0) {
- colors[i].gtk_outline_color->red =
- colors[i].gtk_outline_color->red ^ colors[0].gtk_color->red;
- colors[i].gtk_outline_color->green =
- colors[i].gtk_outline_color->green ^
- colors[0].gtk_color->green;
- colors[i].gtk_outline_color->blue =
- colors[i].gtk_outline_color->blue ^ colors[0].gtk_color->blue;
+ colors[i].gdk_outline_color->red =
+ colors[i].gdk_outline_color->red ^ colors[0].gdk_color->red;
+ colors[i].gdk_outline_color->green =
+ colors[i].gdk_outline_color->green ^
+ colors[0].gdk_color->green;
+ colors[i].gdk_outline_color->blue =
+ colors[i].gdk_outline_color->blue ^ colors[0].gdk_color->blue;
}
error = gdk_color_alloc(colormap,
- colors[i].gtk_outline_color);
+ colors[i].gdk_outline_color);
if (error == FALSE) {
fprintf(stderr,
@@ -190,7 +190,7 @@ static void x_color_allocate_all(void)
GdkColor *x_get_color(int color)
{
if (colors[color].color_name) {
- return(colors[color].gtk_color);
+ return(colors[color].gdk_color);
} else {
fprintf(stderr, _("Tried to get an invalid color: %d\n"), color);
return(&white);
@@ -206,7 +206,7 @@ GdkColor *x_get_color(int color)
GdkColor *x_get_darkcolor(int color)
{
if (colors[color].outline_color_name) {
- return(colors[color].gtk_outline_color);
+ return(colors[color].gdk_outline_color);
} else {
fprintf(stderr, _("Tried to get an invalid color: %d\n"), color);
return(&white);
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 6f16d0e..51701ba 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -609,8 +609,8 @@ struct st_color {
char *ps_color_string;
int image_red, image_green, image_blue;
- GdkColor *gtk_color;
- GdkColor *gtk_outline_color;
+ GdkColor *gdk_color;
+ GdkColor *gdk_outline_color;
int image_color;
};
diff --git a/libgeda/src/s_color.c b/libgeda/src/s_color.c
index 6bf85f6..3cbdca7 100644
--- a/libgeda/src/s_color.c
+++ b/libgeda/src/s_color.c
@@ -49,7 +49,8 @@ void s_color_init(void)
colors[i].image_red = -1;
colors[i].image_green = -1;
colors[i].image_blue = -1;
- colors[i].gtk_color = NULL;
+ colors[i].gdk_color = NULL;
+ colors[i].gdk_outline_color = NULL;
colors[i].image_color = 0;
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs