gEDA-cvs: CVS update: libgeda.h

[cvspsrv@xxxxxxxx]

  User: ahvezda 
  Date: 06/08/06 12:45:31

  Modified:    .        libgeda.h prototype.h struct.h
  Log:
  Applied Patch#1533798: Remove pre-GTK2 code from geda by Peter Brett.  Thanks.
  
  GTK+ 1.2.x specific code is now completely gone from gEDA/gaf. 
  
  
  
  
  Revision  Changes    Path
  1.9       +0 -2      eda/geda/gaf/libgeda/include/libgeda.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: libgeda.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/include/libgeda.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- libgeda.h	19 Feb 2005 23:27:30 -0000	1.8
  +++ libgeda.h	6 Aug 2006 16:45:30 -0000	1.9
  @@ -37,8 +37,6 @@
   #include <libgeda/i_vars.h>
   #include <libgeda/prototype.h>
   
  -#ifndef HAS_GTK12
   #include <gdk-pixbuf/gdk-pixbuf.h>
  -#endif
   
   #endif
  
  
  
  1.104     +0 -4      eda/geda/gaf/libgeda/include/prototype.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: prototype.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/include/prototype.h,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -b -r1.103 -r1.104
  --- prototype.h	16 Jun 2006 12:08:49 -0000	1.103
  +++ prototype.h	6 Aug 2006 16:45:31 -0000	1.104
  @@ -81,11 +81,9 @@
   void i_vars_freenames();
   
   /* gdk-pixbuf-hacks.c */
  -#ifndef HAS_GTK12
   GdkPixbuf *gdk_pixbuf_rotate (GdkPixbuf *pixbuf, guint angle);
   void gdk_pixbuf_add (GdkPixbuf *pixbuf, int offset_x, int offset_y, GdkPixbuf *pixbuf_to_add);
   GdkPixbuf *gdk_pixbuf_mirror_flip(GdkPixbuf *src, gint mirror, gint flip);
  -#endif
   
   /* libgeda.c */
   void libgeda_init(void);
  @@ -368,7 +366,6 @@
   void o_net_modify(TOPLEVEL *w_current, OBJECT *object, int x, int y, int whichone);
   
   /* o_picture.c */
  -#ifndef HAS_GTK12
   OBJECT *o_picture_read(TOPLEVEL *w_current, OBJECT *object_list, char buf[],
               FILE *fp, unsigned int release_ver, unsigned int fileformat_ver);
   char *o_picture_save(OBJECT *object);
  @@ -392,7 +389,6 @@
   guint8 *o_picture_mask_data(GdkPixbuf *image);
   void o_picture_print(TOPLEVEL *w_current, FILE *fp, OBJECT *o_current, 
   		     int origin_x, int origin_y);
  -#endif
   
   /* o_pin_basic.c */
   void get_pin_bounds(TOPLEVEL *w_current, LINE *line, int *left, int *top, int *right, int *bottom);
  
  
  
  1.86      +2 -4      eda/geda/gaf/libgeda/include/struct.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: struct.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/include/struct.h,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -b -r1.85 -r1.86
  --- struct.h	24 Jul 2006 03:29:21 -0000	1.85
  +++ struct.h	6 Aug 2006 16:45:31 -0000	1.86
  @@ -114,10 +114,9 @@
   #define BOX_LOWER_LEFT 3
   
   struct st_picture {
  -#ifndef HAS_GTK12
     GdkPixbuf *original_picture;
     GdkPixbuf *displayed_picture;
  -#endif
  +
     double ratio;
     char *filename;
     int angle;
  @@ -468,9 +467,8 @@
   
   
     /* used by add picture dialog */
  -#ifndef HAS_GTK12
     GdkPixbuf *current_pixbuf;
  -#endif
  +
     double pixbuf_wh_ratio;                  /* width/height ratio of the pixbuf */
     char *pixbuf_filename;
   
  
  
  


_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs