[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: o_arc.c
User: pcjc2
Date: 07/04/06 13:29:14
Modified: . Tag: noscreen o_arc.c o_box.c o_circle.c o_line.c
x_dialog.c x_multiattrib.c x_pagesel.c x_preview.c
x_window.c
Log:
Sync with trunk
Revision Changes Path
No revision
No revision
1.26.2.4 +7 -1 eda/geda/gaf/gschem/src/o_arc.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_arc.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_arc.c,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- o_arc.c 25 Feb 2007 14:37:38 -0000 1.26.2.3
+++ o_arc.c 6 Apr 2007 17:29:13 -0000 1.26.2.4
@@ -36,6 +36,12 @@
/*! \brief */
#define GET_BOX_HEIGHT(w) \
abs((w)->last_y - (w)->start_y)
+
+typedef void (*DRAW_FUNC)( GdkDrawable *w, GdkGC *gc, GdkColor *color,
+ GdkCapStyle cap, gint x, gint y, gint radius,
+ gint angle1, gint angle2,
+ gint arc_width, gint length, gint space );
+
/*! \brief
* \note pb20011011 - added this macro to compute distance
*/
@@ -62,7 +68,7 @@
int arc_width;
GdkCapStyle arc_end;
GdkColor *color;
- void (*draw_func)() = NULL;
+ DRAW_FUNC draw_func = NULL;
int length, space;
if (o_current->arc == NULL) {
1.24.2.6 +12 -2 eda/geda/gaf/gschem/src/o_box.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_box.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_box.c,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -u -b -r1.24.2.5 -r1.24.2.6
--- o_box.c 26 Mar 2007 19:16:11 -0000 1.24.2.5
+++ o_box.c 6 Apr 2007 17:29:13 -0000 1.24.2.6
@@ -39,6 +39,16 @@
#define GET_BOX_TOP(w) \
min((w)->start_y, (w)->last_y);
+typedef void (*DRAW_FUNC)( GdkDrawable *w, GdkGC *gc, GdkColor *color,
+ GdkCapStyle cap, gint filled,
+ gint x, gint y, gint width, gint height,
+ gint line_width, gint length, gint space );
+
+typedef void (*FILL_FUNC)( GdkDrawable *w, GdkGC *gc, GdkColor *color,
+ gint x, gint y, gint width, gint height,
+ gint fill_width, gint angle1, gint pitch1,
+ gint angle2, gint pitch2 );
+
/*! \brief Draw a box on the screen.
* \par Function Description
* This function is used to draw a box on screen. The box is described in
@@ -60,8 +70,8 @@
int fill_width, angle1, pitch1, angle2, pitch2;
GdkCapStyle box_end;
GdkColor *color;
- void (*draw_func)() = NULL;
- void (*fill_func)();
+ DRAW_FUNC draw_func = NULL;
+ FILL_FUNC fill_func;
if (o_current->box == NULL) {
return;
1.22.2.5 +12 -2 eda/geda/gaf/gschem/src/o_circle.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_circle.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_circle.c,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -b -r1.22.2.4 -r1.22.2.5
--- o_circle.c 26 Mar 2007 19:16:11 -0000 1.22.2.4
+++ o_circle.c 6 Apr 2007 17:29:13 -0000 1.22.2.5
@@ -35,6 +35,16 @@
#define GET_BOX_HEIGHT(w) \
abs((w)->last_y - (w)->start_y)
+typedef void (*DRAW_FUNC)( GdkDrawable *w, GdkGC *gc, GdkColor *color,
+ GdkCapStyle cap, gint x, gint y, gint radius,
+ gint angle1, gint angle2,
+ gint arc_width, gint length, gint space );
+
+typedef void (*FILL_FUNC)( GdkDrawable *w, GdkGC *gc, GdkColor *color,
+ gint x, gint y, gint radius,
+ gint fill_width, gint angle1, gint pitch1,
+ gint angle2, gint pitch2 );
+
/*! \brief Draw a circle on the screen.
* \par Function Description
* This function is used to draw a circle on screen. The circle is described
@@ -57,8 +67,8 @@
int fill_width, angle1, pitch1, angle2, pitch2;
GdkCapStyle circle_end;
GdkColor *color;
- void (*draw_func)() = NULL;
- void (*fill_func)();
+ DRAW_FUNC draw_func = NULL;
+ FILL_FUNC fill_func;
if (o_current->circle == NULL) {
return;
1.23.2.4 +6 -1 eda/geda/gaf/gschem/src/o_line.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_line.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_line.c,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -b -r1.23.2.3 -r1.23.2.4
--- o_line.c 25 Feb 2007 14:37:38 -0000 1.23.2.3
+++ o_line.c 6 Apr 2007 17:29:13 -0000 1.23.2.4
@@ -30,6 +30,11 @@
#include <dmalloc.h>
#endif
+typedef void (*DRAW_FUNC)( GdkDrawable *w, GdkGC *gc, GdkColor *color,
+ GdkCapStyle cap,
+ gint x1, gint y1, gint x2, gint y2,
+ gint line_width, gint length, gint space );
+
/*! \brief Draw a line on screen.
* \par Function Description
* This function is used to draw a line on screen. The line is described
@@ -49,7 +54,7 @@
int line_width, length, space;
GdkColor *color;
GdkCapStyle line_end;
- void (*draw_func)() = NULL;
+ DRAW_FUNC draw_func = NULL;
if (o_current->line == NULL) {
return;
1.68.2.6 +17 -15 eda/geda/gaf/gschem/src/x_dialog.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_dialog.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_dialog.c,v
retrieving revision 1.68.2.5
retrieving revision 1.68.2.6
diff -u -b -r1.68.2.5 -r1.68.2.6
--- x_dialog.c 24 Feb 2007 17:14:34 -0000 1.68.2.5
+++ x_dialog.c 6 Apr 2007 17:29:13 -0000 1.68.2.6
@@ -3833,10 +3833,6 @@
x_window_close_page (toplevel, page);
break;
- case GTK_RESPONSE_CANCEL:
- /* action selected: cancel */
- /* nothing to do */
- break;
case GTK_RESPONSE_YES:
/* action selected: save */
@@ -3851,8 +3847,14 @@
/* do not close page */
break;
+ case GTK_RESPONSE_CANCEL:
+ /* action selected: cancel */
+ /* fall through */
default:
- g_assert_not_reached ();
+ /* Hit when the user breaks out of the dialog with the escape key
+ * or otherwise destroys the dialog window without a proper response */
+ /* nothing to do */
+ break;
}
gtk_widget_destroy (dialog);
@@ -3908,12 +3910,6 @@
ret = TRUE;
break;
- case GTK_RESPONSE_CANCEL:
- /* action selected: cancel */
- /* do not close window */
- ret = FALSE;
- break;
-
case GTK_RESPONSE_YES:
/* action selected: save */
/* prompts user for the filename and ultimate confirmation for */
@@ -3934,8 +3930,14 @@
g_list_free (unsaved_pages);
break;
+ case GTK_RESPONSE_CANCEL:
+ /* action selected: cancel */
+ /* fall through */
default:
- g_assert_not_reached ();
+ /* Hit when the user breaks out of the dialog with the escape key
+ * or otherwise destroys the dialog window without a proper response */
+ ret = FALSE;
+ break;
}
gtk_widget_destroy (dialog);
1.3.6.3 +1 -1 eda/geda/gaf/gschem/src/x_multiattrib.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_multiattrib.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_multiattrib.c,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -u -b -r1.3.6.2 -r1.3.6.3
--- x_multiattrib.c 11 Feb 2007 23:58:58 -0000 1.3.6.2
+++ x_multiattrib.c 6 Apr 2007 17:29:14 -0000 1.3.6.3
@@ -1185,7 +1185,7 @@
GtkWidget *menu;
struct menuitem_t {
gchar *label;
- void (*callback)(void);
+ GCallback callback;
};
struct menuitem_t menuitems[] = {
{ N_("Duplicate"), G_CALLBACK (multiattrib_callback_popup_duplicate) },
1.14.6.1 +1 -1 eda/geda/gaf/gschem/src/x_pagesel.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_pagesel.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_pagesel.c,v
retrieving revision 1.14
retrieving revision 1.14.6.1
diff -u -b -r1.14 -r1.14.6.1
--- x_pagesel.c 15 Jul 2006 18:51:41 -0000 1.14
+++ x_pagesel.c 6 Apr 2007 17:29:14 -0000 1.14.6.1
@@ -256,7 +256,7 @@
GtkWidget *menu;
struct menuitem_t {
gchar *label;
- void (*callback)(void);
+ GCallback callback;
};
struct menuitem_t menuitems[] = {
{ N_("New Page"), G_CALLBACK (pagesel_callback_popup_new_page) },
1.13.6.2 +1 -1 eda/geda/gaf/gschem/src/x_preview.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_preview.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_preview.c,v
retrieving revision 1.13.6.1
retrieving revision 1.13.6.2
diff -u -b -r1.13.6.1 -r1.13.6.2
--- x_preview.c 11 Feb 2007 23:58:58 -0000 1.13.6.1
+++ x_preview.c 6 Apr 2007 17:29:14 -0000 1.13.6.2
@@ -313,7 +313,7 @@
{
struct event_reg_t {
gchar *detailed_signal;
- void (*c_handler)(void);
+ GCallback c_handler;
} drawing_area_events[] = {
{ "realize", G_CALLBACK (preview_callback_realize) },
{ "expose_event", G_CALLBACK (preview_callback_expose) },
1.50.2.2 +1 -1 eda/geda/gaf/gschem/src/x_window.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_window.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_window.c,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -u -b -r1.50.2.1 -r1.50.2.2
--- x_window.c 24 Feb 2007 17:14:34 -0000 1.50.2.1
+++ x_window.c 6 Apr 2007 17:29:14 -0000 1.50.2.2
@@ -345,7 +345,7 @@
{
struct event_reg_t {
gchar *detailed_signal;
- void (*c_handler)(void);
+ GCallback c_handler;
};
struct event_reg_t drawing_area_events[] = {
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs