Remove GtkObject completely
This commit is contained in:
		| @ -36,7 +36,6 @@ gail_c_sources =			\ | ||||
| 	gailmenuitem.c			\ | ||||
| 	gailnotebook.c			\ | ||||
| 	gailnotebookpage.c		\ | ||||
| 	gailobject.c			\ | ||||
| 	gailpaned.c			\ | ||||
| 	gailprogressbar.c		\ | ||||
| 	gailradiobutton.c		\ | ||||
| @ -90,7 +89,6 @@ gail_private_h_sources =		\ | ||||
| 	gailmenuitem.h			\ | ||||
| 	gailnotebook.h			\ | ||||
| 	gailnotebookpage.h		\ | ||||
| 	gailobject.h			\ | ||||
| 	gailpaned.h			\ | ||||
| 	gailprogressbar.h		\ | ||||
| 	gailradiobutton.h		\ | ||||
|  | ||||
| @ -71,7 +71,6 @@ static guint focus_notify_handler = 0; | ||||
| static guint focus_tracker_id = 0; | ||||
| static GQuark quark_focus_object = 0; | ||||
|  | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_OBJECT, GailObject, gail_object, GTK_TYPE_OBJECT) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WIDGET, GailWidget, gail_widget, GTK_TYPE_WIDGET) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CONTAINER, GailContainer, gail_container, GTK_TYPE_CONTAINER) | ||||
| GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_BUTTON, GailButton, gail_button, GTK_TYPE_BUTTON) | ||||
| @ -907,9 +906,6 @@ gail_accessibility_module_init (void) | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_RADIO_MENU_ITEM, gail_radio_menu_item); | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_EXPANDER, gail_expander); | ||||
|  | ||||
|   /* LIBGNOMECANVAS SUPPORT */ | ||||
|   GAIL_WIDGET_SET_FACTORY (GTK_TYPE_OBJECT, gail_object); | ||||
|  | ||||
|   atk_focus_tracker_init (gail_focus_tracker_init); | ||||
|   focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker); | ||||
|  | ||||
|  | ||||
| @ -19,7 +19,6 @@ | ||||
| #include <gail/gailmenushell.h> | ||||
| #include <gail/gailmenuitem.h> | ||||
| #include <gail/gailnotebook.h> | ||||
| #include <gail/gailobject.h> | ||||
| #include <gail/gailpaned.h> | ||||
| #include <gail/gailprogressbar.h> | ||||
| #include <gail/gailradiobutton.h> | ||||
|  | ||||
| @ -1,54 +0,0 @@ | ||||
| /* GAIL - The GNOME Accessibility Implementation Library | ||||
|  * Copyright 2003 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" | ||||
|  | ||||
| #include <gtk/gtk.h> | ||||
| #include "gailobject.h" | ||||
|  | ||||
| static void       gail_object_class_init               (GailObjectClass *klass); | ||||
|  | ||||
| static void       gail_object_init                     (GailObject *object); | ||||
|  | ||||
| static void       gail_object_real_initialize          (AtkObject       *obj, | ||||
|                                                         gpointer        data); | ||||
|  | ||||
| G_DEFINE_TYPE (GailObject, gail_object, ATK_TYPE_GOBJECT_ACCESSIBLE) | ||||
|  | ||||
| static void | ||||
| gail_object_class_init (GailObjectClass *klass) | ||||
| { | ||||
|   AtkObjectClass *class = ATK_OBJECT_CLASS (klass); | ||||
|  | ||||
|   class->initialize = gail_object_real_initialize; | ||||
| } | ||||
|  | ||||
| static void | ||||
| gail_object_init (GailObject *object) | ||||
| { | ||||
| } | ||||
|  | ||||
| static void | ||||
| gail_object_real_initialize (AtkObject *obj, | ||||
|                              gpointer  data) | ||||
| { | ||||
|   ATK_OBJECT_CLASS (gail_object_parent_class)->initialize (obj, data); | ||||
|  | ||||
|   obj->role = ATK_ROLE_UNKNOWN; | ||||
| } | ||||
| @ -1,51 +0,0 @@ | ||||
| /* GAIL - The GNOME Accessibility Implementation Library | ||||
|  * Copyright 2003 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_OBJECT_H__ | ||||
| #define __GAIL_OBJECT_H__ | ||||
|  | ||||
| #include <atk/atk.h> | ||||
|  | ||||
| G_BEGIN_DECLS | ||||
|  | ||||
| #define GAIL_TYPE_OBJECT                  (gail_object_get_type ()) | ||||
| #define GAIL_OBJECT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_OBJECT, GailObject) | ||||
| #define GAIL_OBJECT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_OBJECT, GailObjectlass)) | ||||
| #define GAIL_IS_OBJECT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_OBJECT)) | ||||
| #define GAIL_IS_OBJECT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_OBJECT)) | ||||
| #define GAIL_OBJECT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_OBJECT, GailObjectlass)) | ||||
|  | ||||
| typedef struct _GailObject                 GailObject; | ||||
| typedef struct _GailObjectClass            GailObjectClass; | ||||
|  | ||||
| struct _GailObject | ||||
| { | ||||
|   AtkGObjectAccessible parent; | ||||
| }; | ||||
|  | ||||
| GType gail_object_get_type (void); | ||||
|  | ||||
| struct _GailObjectClass | ||||
| { | ||||
|   AtkGObjectAccessibleClass parent_class; | ||||
| }; | ||||
|  | ||||
| G_END_DECLS | ||||
|  | ||||
| #endif /* __GAIL_OBJECT_H__ */ | ||||
		Reference in New Issue
	
	Block a user
	 Matthias Clasen
					Matthias Clasen