Remove GailPixmap completely
This commit is contained in:
		 Christian Dywan
					Christian Dywan
				
			
				
					committed by
					
						 Javier Jardón
						Javier Jardón
					
				
			
			
				
	
			
			
			 Javier Jardón
						Javier Jardón
					
				
			
						parent
						
							575d3ffa83
						
					
				
				
					commit
					77ff51b0c0
				
			| @ -39,7 +39,6 @@ gail_c_sources =			\ | ||||
| 	gailnotebookpage.c		\ | ||||
| 	gailobject.c			\ | ||||
| 	gailpaned.c			\ | ||||
| 	gailpixmap.c			\ | ||||
| 	gailprogressbar.c		\ | ||||
| 	gailradiobutton.c		\ | ||||
| 	gailradiomenuitem.c		\ | ||||
| @ -96,7 +95,6 @@ gail_private_h_sources =		\ | ||||
| 	gailnotebookpage.h		\ | ||||
| 	gailobject.h			\ | ||||
| 	gailpaned.h			\ | ||||
| 	gailpixmap.h			\ | ||||
| 	gailprogressbar.h		\ | ||||
| 	gailradiobutton.h		\ | ||||
| 	gailradiomenuitem.h		\ | ||||
|  | ||||
| @ -100,7 +100,6 @@ GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_TREE_VIEW, GailTreeView, gail_tree_view, GTK_T | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_FRAME, GailFrame, gail_frame, GTK_TYPE_FRAME) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_RADIO_BUTTON, GailRadioButton, gail_radio_button, GTK_TYPE_RADIO_BUTTON) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_ARROW, GailArrow, gail_arrow, GTK_TYPE_ARROW) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_PIXMAP, GailPixmap, gail_pixmap, GTK_TYPE_PIXMAP) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SEPARATOR, GailSeparator, gail_separator, GTK_TYPE_SEPARATOR) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_BOX, GailBox, gail_box, GTK_TYPE_BOX) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_SCROLLED_WINDOW, GailScrolledWindow, gail_scrolled_window, GTK_TYPE_SCROLLED_WINDOW) | ||||
| @ -907,7 +906,6 @@ gail_accessibility_module_init (void) | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER, gail_renderer_cell); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RADIO_BUTTON, gail_radio_button); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_ARROW, gail_arrow); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_PIXMAP, gail_pixmap); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SEPARATOR, gail_separator); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_BOX, gail_box); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_SCROLLED_WINDOW, gail_scrolled_window); | ||||
|  | ||||
| @ -22,7 +22,6 @@ | ||||
| #include <gail/gailnotebook.h> | ||||
| #include <gail/gailobject.h> | ||||
| #include <gail/gailpaned.h> | ||||
| #include <gail/gailpixmap.h> | ||||
| #include <gail/gailprogressbar.h> | ||||
| #include <gail/gailradiobutton.h> | ||||
| #include <gail/gailradiomenuitem.h> | ||||
|  | ||||
| @ -1,158 +0,0 @@ | ||||
| /* GAIL - The GNOME Accessibility Implementation Library | ||||
|  * Copyright 2001 Sun Microsystems Inc. | ||||
|  * | ||||
|  * This library is free software; you can redistribute it and/or | ||||
|  * modify it under the terms of the GNU Lesser 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 | ||||
|  * Lesser General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU Lesser General Public | ||||
|  * License along with this library; if not, write to the | ||||
|  * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||||
|  * Boston, MA 02111-1307, USA. | ||||
|  */ | ||||
|  | ||||
| #include "config.h" | ||||
|  | ||||
| #undef GTK_DISABLE_DEPRECATED | ||||
|  | ||||
| #include <gtk/gtk.h> | ||||
|  | ||||
| #include "gailpixmap.h" | ||||
|  | ||||
| static void	 gail_pixmap_class_init		(GailPixmapClass *klass); | ||||
| static void      gail_pixmap_init               (GailPixmap      *pixmap); | ||||
| static void      gail_pixmap_initialize         (AtkObject       *accessible, | ||||
|                                                  gpointer         data); | ||||
|  | ||||
| /* AtkImage */ | ||||
| static void  atk_image_interface_init   (AtkImageIface  *iface); | ||||
| static G_CONST_RETURN gchar* gail_pixmap_get_image_description  | ||||
|                                         (AtkImage       *obj); | ||||
| static void  gail_pixmap_get_image_position     | ||||
|                                         (AtkImage       *obj, | ||||
|                                          gint           *x, | ||||
|                                          gint           *y, | ||||
|                                          AtkCoordType   coord_type); | ||||
| static void  gail_pixmap_get_image_size (AtkImage       *obj, | ||||
|                                          gint           *width, | ||||
|                                          gint           *height); | ||||
| static gboolean gail_pixmap_set_image_description  | ||||
|                                         (AtkImage       *obj, | ||||
|                                         const gchar    *description); | ||||
| static void  gail_pixmap_finalize       (GObject         *object); | ||||
|  | ||||
| G_DEFINE_TYPE_WITH_CODE (GailPixmap, gail_pixmap, GAIL_TYPE_WIDGET, | ||||
|                          G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) | ||||
|  | ||||
| static void	  | ||||
| gail_pixmap_class_init (GailPixmapClass *klass) | ||||
| { | ||||
|   GObjectClass *gobject_class = G_OBJECT_CLASS (klass); | ||||
|   AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); | ||||
|   | ||||
|   atk_object_class->initialize = gail_pixmap_initialize; | ||||
|  | ||||
|   gobject_class->finalize = gail_pixmap_finalize; | ||||
| } | ||||
|  | ||||
| static void | ||||
| gail_pixmap_init (GailPixmap *pixmap) | ||||
| { | ||||
|   pixmap->image_description = NULL; | ||||
| } | ||||
|  | ||||
| static void | ||||
| gail_pixmap_initialize (AtkObject *accessible, | ||||
|                         gpointer  data) | ||||
| { | ||||
|   ATK_OBJECT_CLASS (gail_pixmap_parent_class)->initialize (accessible, data); | ||||
|  | ||||
|   accessible->role = ATK_ROLE_ICON; | ||||
| } | ||||
|  | ||||
| static void | ||||
| atk_image_interface_init (AtkImageIface *iface) | ||||
| { | ||||
|   iface->get_image_description = gail_pixmap_get_image_description; | ||||
|   iface->get_image_position = gail_pixmap_get_image_position; | ||||
|   iface->get_image_size = gail_pixmap_get_image_size; | ||||
|   iface->set_image_description = gail_pixmap_set_image_description; | ||||
| } | ||||
|  | ||||
| static G_CONST_RETURN gchar*  | ||||
| gail_pixmap_get_image_description (AtkImage       *obj) | ||||
| { | ||||
|   GailPixmap* pixmap; | ||||
|  | ||||
|   g_return_val_if_fail (GAIL_IS_PIXMAP (obj), NULL); | ||||
|  | ||||
|   pixmap = GAIL_PIXMAP (obj); | ||||
|  | ||||
|   return pixmap->image_description; | ||||
| } | ||||
|  | ||||
| static void | ||||
| gail_pixmap_get_image_position (AtkImage       *obj, | ||||
|                                 gint           *x, | ||||
|                                 gint           *y, | ||||
|                                 AtkCoordType   coord_type) | ||||
| { | ||||
|   atk_component_get_position (ATK_COMPONENT (obj), x, y, coord_type); | ||||
| } | ||||
|  | ||||
| static void   | ||||
| gail_pixmap_get_image_size (AtkImage       *obj, | ||||
|                             gint           *width, | ||||
|                             gint           *height) | ||||
| { | ||||
|   GtkWidget *widget; | ||||
|   GtkPixmap *pixmap; | ||||
|   | ||||
|   *width = -1; | ||||
|   *height = -1; | ||||
|  | ||||
|   g_return_if_fail (GAIL_IS_PIXMAP (obj)); | ||||
|  | ||||
|   widget = GTK_ACCESSIBLE (obj)->widget; | ||||
|   if (widget == 0) | ||||
|     /* State is defunct */ | ||||
|     return; | ||||
|  | ||||
|   g_return_if_fail (GTK_IS_PIXMAP (widget)); | ||||
|  | ||||
|   pixmap = GTK_PIXMAP (widget); | ||||
|  | ||||
|   if (pixmap->pixmap) | ||||
|     gdk_drawable_get_size (pixmap->pixmap, width, height); | ||||
| } | ||||
|  | ||||
| static gboolean  | ||||
| gail_pixmap_set_image_description (AtkImage       *obj, | ||||
|                                    const gchar    *description) | ||||
| {  | ||||
|   GailPixmap* pixmap; | ||||
|  | ||||
|   g_return_val_if_fail (GAIL_IS_PIXMAP (obj), FALSE); | ||||
|  | ||||
|   pixmap = GAIL_PIXMAP (obj); | ||||
|   g_free (pixmap->image_description); | ||||
|  | ||||
|   pixmap->image_description = g_strdup (description); | ||||
|  | ||||
|   return TRUE; | ||||
| } | ||||
|  | ||||
| static void | ||||
| gail_pixmap_finalize (GObject      *object) | ||||
| { | ||||
|   GailPixmap *pixmap = GAIL_PIXMAP (object); | ||||
|  | ||||
|   g_free (pixmap->image_description); | ||||
|   G_OBJECT_CLASS (gail_pixmap_parent_class)->finalize (object); | ||||
| } | ||||
| @ -1,54 +0,0 @@ | ||||
| /* GAIL - The GNOME Accessibility Implementation Library | ||||
|  * Copyright 2001 Sun Microsystems Inc. | ||||
|  * | ||||
|  * 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 Library General Public | ||||
|  * License along with this library; if not, write to the | ||||
|  * Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||||
|  * Boston, MA 02111-1307, USA. | ||||
|  */ | ||||
|  | ||||
| #ifndef __GAIL_PIXMAP_H__ | ||||
| #define __GAIL_PIXMAP_H__ | ||||
|  | ||||
| #include <gail/gailwidget.h> | ||||
|  | ||||
| G_BEGIN_DECLS | ||||
|  | ||||
| #define GAIL_TYPE_PIXMAP                      (gail_pixmap_get_type ()) | ||||
| #define GAIL_PIXMAP(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PIXMAP, GailPixmap)) | ||||
| #define GAIL_PIXMAP_CLASS(klass)              (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_PIXMAP, GailPixmapClass)) | ||||
| #define GAIL_IS_PIXMAP(obj)                   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_PIXMAP)) | ||||
| #define GAIL_IS_PIXMAP_CLASS(klass)           (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_PIXMAP)) | ||||
| #define GAIL_PIXMAP_GET_CLASS(obj)            (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_PIXMAP, GailPixmapClass)) | ||||
|  | ||||
| typedef struct _GailPixmap              GailPixmap; | ||||
| typedef struct _GailPixmapClass         GailPixmapClass; | ||||
|  | ||||
| struct _GailPixmap | ||||
| { | ||||
|   GailWidget parent; | ||||
|  | ||||
|   gchar*     image_description; | ||||
|  | ||||
| }; | ||||
|  | ||||
| GType gail_pixmap_get_type (void); | ||||
|  | ||||
| struct _GailPixmapClass | ||||
| { | ||||
|   GailWidgetClass parent_class; | ||||
| }; | ||||
|  | ||||
| G_END_DECLS | ||||
|  | ||||
| #endif /* __GAIL_PIXMAP_H__ */ | ||||
		Reference in New Issue
	
	Block a user