[gtk+/drop-gail: 4/24] Add a header for GtkWidgetAccessible



commit aa083858db683fc58ad0f20ede6624d3a97e296c
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Feb 21 02:01:58 2011 -0500

    Add a header for GtkWidgetAccessible

 gtk/Makefile.am           |    2 +
 gtk/gtkwidget.c           |   24 +----------------
 gtk/gtkwidgetaccessible.h |   62 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 22 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b558763..78686ee 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -377,6 +377,7 @@ endif
 gtk_private_h_sources =		\
 	gtk9slice.h		\
 	gtkaccelgroupprivate.h	\
+	gtkaccessibility.h	\
 	gtkaccessibleprivate.h	\
 	gtkanimationdescription.h \
 	gtkappchooserprivate.h	\
@@ -444,6 +445,7 @@ gtk_private_h_sources =		\
 	gtktreedatalist.h	\
 	gtktreeprivate.h	\
 	gtkwidgetprivate.h	\
+	gtkwidgetaccessible.h	\
 	gtkwindowprivate.h	\
 	gtktreemenu.h		\
 	$(gtk_clipboard_dnd_h_sources) \
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 48768b0..e30439c 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -14363,28 +14363,8 @@ gtk_widget_get_style_context (GtkWidget *widget)
 
 /* --- Accessibility --- */
 
-#define GTK_TYPE_WIDGET_ACCESSIBLE (gtk_widget_accessible_get_type ())
-#define GTK_WIDGET_ACCESSIBLE(obj)(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessible))
-#define GTK_WIDGET_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessibleClass))
-
-typedef struct _GtkWidgetAccessible GtkWidgetAccessible;
-typedef struct _GtkWidgetAccessibleClass GtkWidgetAccessibleClass;
-
-struct _GtkWidgetAccessible
-{
-  GtkAccessible parent;
-};
-
-struct _GtkWidgetAccessibleClass
-{
-  GtkAccessibleClass parent_class;
-
-  /* FIXME: drop these */
-  void     (*notify_gtk) (GObject       *object,
-                          GParamSpec    *pspec);
-  gboolean (*focus_gtk)  (GtkWidget     *widget,
-                          GdkEventFocus *event);
-};
+#include "gtkaccessibility.h"
+#include "gtkwidgetaccessible.h"
 
 static void atk_component_interface_init (AtkComponentIface *iface);
 
diff --git a/gtk/gtkwidgetaccessible.h b/gtk/gtkwidgetaccessible.h
new file mode 100644
index 0000000..ac8e200
--- /dev/null
+++ b/gtk/gtkwidgetaccessible.h
@@ -0,0 +1,62 @@
+/* GTK - The GIMP Toolkit
+ * Copyright 2011 Red Hat, 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.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_WIDGET_ACCESSIBLE_H__
+#define __GTK_WIDGET_ACCESSIBLE_H__
+
+#include <atk/atk.h>
+#include <gtk/gtkwidget.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_WIDGET_ACCESSIBLE (gtk_widget_accessible_get_type ())
+#define GTK_WIDGET_ACCESSIBLE(obj)(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessible))
+#define GTK_WIDGET_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessibleClass))
+
+typedef struct _GtkWidgetAccessible GtkWidgetAccessible;
+typedef struct _GtkWidgetAccessibleClass GtkWidgetAccessibleClass;
+
+struct _GtkWidgetAccessible
+{
+  GtkAccessible parent;
+};
+
+struct _GtkWidgetAccessibleClass
+{
+  GtkAccessibleClass parent_class;
+
+  /* FIXME: drop these */
+  void     (*notify_gtk) (GObject       *object,
+                          GParamSpec    *pspec);
+  gboolean (*focus_gtk)  (GtkWidget     *widget,
+                          GdkEventFocus *event);
+};
+
+
+GType gtk_widget_accessible_get_type (void) G_GNUC_CONST;
+GType gtk_widget_accessible_factory_get_type (void) G_GNUC_CONST;
+
+
+G_END_DECLS
+
+#endif  /* __GTK_WIDGET_ACCESSIBLE_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]