mostly compiler warnings

src/canvas_choice/crcanvas_demo.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Mar 20 12:21 2007 (rds)
+ * Last edited: Jun 10 12:12 2009 (rds)
  * Created: Wed Mar 14 21:39:04 2007 (rds)
- * CVS info:   $Id: crcanvas_demo.c,v 1.1 2007-03-21 12:28:32 rds Exp $
+ * CVS info:   $Id: crcanvas_demo.c,v 1.2 2009-06-10 11:14:17 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -54,7 +54,9 @@ static void suite_destroy_notify_cb(gpointer user_data);
 
 static gpointer create_item_cb(gpointer parent_item_data,  gpointer user_data);
 static gpointer create_group_cb(gpointer parent_item_data, double leftmost, gpointer user_data);
+#ifdef RDS_DONT_INCLUDE
 static gpointer get_item_bounds(gpointer parent_item_data, double *x1, double *y1, double *x2, double *y2, gpointer user_data);
+#endif /* RDS_DONT_INCLUDE */
 static gpointer hide_item_cb(gpointer parent_item_data,    gpointer user_data);
 static gpointer move_item_cb(gpointer parent_item_data,    gpointer user_data);
 
@@ -195,7 +197,9 @@ static void zoom_out_cb(GtkWidget *button, gpointer user_data)
 /* called by the toplevel destroy... */
 static void suite_destroy_notify_cb(gpointer user_data)
 {
+#ifdef  RDS_DONT_INCLUDE
   CrCanvasTestSuiteData suite = (CrCanvasTestSuiteData)user_data;
+#endif /* RDS_DONT_INCLUDE */
   printf("Suite DestroyNotify CB\n");
 
   return ;
@@ -248,7 +252,7 @@ static gpointer create_group_cb(gpointer parent_item_data, double leftmost, gpoi
 
   return new_item;
 }
-
+#ifdef RDS_DONT_INCLUDE
 static gpointer get_item_bounds(gpointer parent_item_data, double *x1, double *y1, double *x2, double *y2, gpointer user_data)
 {
 
@@ -256,6 +260,7 @@ static gpointer get_item_bounds(gpointer parent_item_data, double *x1, double *y
 
   return NULL;
 }
+#endif /* RDS_DONT_INCLUDE */
 
 static gpointer hide_item_cb(gpointer parent_item_data, gpointer user_data)
 {

src/canvas_choice/goocanvas_demo.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Mar 19 18:07 2007 (rds)
+ * Last edited: Jun 10 12:12 2009 (rds)
  * Created: Wed Mar 14 21:39:04 2007 (rds)
- * CVS info:   $Id: goocanvas_demo.c,v 1.1 2007-03-21 12:28:32 rds Exp $
+ * CVS info:   $Id: goocanvas_demo.c,v 1.2 2009-06-10 11:14:17 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -222,7 +222,7 @@ static gpointer create_group_cb(gpointer parent_item_data, double leftmost, gpoi
 
   if(parent)
     {
-      group = goo_canvas_group_new(parent, NULL);
+      group = (GooCanvasGroup *) goo_canvas_group_new(parent, NULL);
     }
 
   return group;

src/canvas_choice/goocanvas_mv_demo.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Mar 20 13:49 2007 (rds)
+ * Last edited: Jun 10 12:13 2009 (rds)
  * Created: Wed Mar 14 21:39:04 2007 (rds)
- * CVS info:   $Id: goocanvas_mv_demo.c,v 1.1 2007-03-21 12:28:32 rds Exp $
+ * CVS info:   $Id: goocanvas_mv_demo.c,v 1.2 2009-06-10 11:14:17 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -190,11 +190,13 @@ static gboolean goocanvas_item_debug_G = FALSE;
 /* canvas stuff */
 static gpointer create_item_cb(gpointer parent_item_data, gpointer user_data)
 {
+#ifdef RDS_DONT_INCLUDE
   GooCanvasTestSuiteData suite = (GooCanvasTestSuiteData)user_data;
+  GooCanvasBounds bounds = {0.0};
   GooCanvasItem *bounds_item = NULL;
+#endif /* RDS_DONT_INCLUDE */
   GooCanvasItemModel *item = NULL;
   double x, y, width, height;
-  GooCanvasBounds bounds = {0.0};
 
   if(goocanvas_item_debug_G)
     printf("%s\n", __PRETTY_FUNCTION__);

src/canvas_choice/gui.c

@@ -27,15 +27,16 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Mar 19 12:54 2007 (rds)
+ * Last edited: Jun 10 12:10 2009 (rds)
  * Created: Fri Mar 16 09:20:26 2007 (rds)
- * CVS info:   $Id: gui.c,v 1.1 2007-03-21 12:28:32 rds Exp $
+ * CVS info:   $Id: gui.c,v 1.2 2009-06-10 11:14:17 rds Exp $
  *-------------------------------------------------------------------
  */
 
 #include <gui.h>
-
+#ifdef RDS_DONT_INCLUDE
 static void toplevelDestroyCB(GtkWidget *widget, gpointer cb_data);
+#endif /* RDS_DONT_INCLUDE */
 static void quitCB(GtkWidget *button, gpointer user_data);
 
 

src/canvas_choice/long_item_test.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Mar 22 08:24 2007 (rds)
+ * Last edited: Jun 10 12:13 2009 (rds)
  * Created: Tue Mar 20 14:51:37 2007 (rds)
- * CVS info:   $Id: long_item_test.c,v 1.2 2007-04-02 10:38:07 rds Exp $
+ * CVS info:   $Id: long_item_test.c,v 1.3 2009-06-10 11:14:17 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -497,7 +497,7 @@ static gboolean getEntryCoord(GtkWidget *entry, double *double_out)
 
   errno = 0 ;
 
-  str = gtk_entry_get_text(GTK_ENTRY(entry));
+  str = (char *)gtk_entry_get_text(GTK_ENTRY(entry));
 
   ret_val = strtod(str, &end_ptr) ;