AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Some renaming

Browse Source 
Move gail.h to gtkaccessibility.h, and libgail to libgtka11y.
This commit is contained in:
Matthias Clasen 2012-12-27 01:06:30 -05:00
parent 221ac71278
commit 651241b685
5 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/Makefile.am
View File

@ -107,12 +107,12 @@ endif
libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \
$(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/a11y/libgail.la \
$(top_builddir)/gtk/a11y/libgtka11y.la \
$(GMODULE_LIBS) \
$(GTK_DEP_LIBS)
deps = \
$(top_builddir)/gdk/libgdk-3.la \
$(top_builddir)/gtk/a11y/libgail.la
$(top_builddir)/gtk/a11y/libgtka11y.la
# libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS

32
gtk/a11y/Makefile.am
View File

@ -1,9 +1,9 @@
include $(top_srcdir)/Makefile.decl
noinst_LTLIBRARIES = libgail.la
noinst_LTLIBRARIES = libgtka11y.la
gail_c_sources = \
gail.c \
gtka11y_c_sources = \
gtkaccessibility.c \
gtkarrowaccessible.c \
gtkbooleancellaccessible.c \
gtkbuttonaccessible.c \
@ -104,15 +104,15 @@ gail_private_h_sources = \
gtktreeviewaccessibleprivate.h \
gtktextviewaccessibleprivate.h \
gtkwidgetaccessibleprivate.h \
gail.h \
gtkaccessibility.h \
gailutil.h \
gailmisc.h
libgail_la_SOURCES = \
$(gail_c_sources) \
$(gail_private_h_sources)
libgtka11y_la_SOURCES = \
$(gtka11y_c_sources) \
$(gtka11y_private_h_sources)
libgail_la_CPPFLAGS = \
libgtka11y_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@ -122,18 +122,18 @@ libgail_la_CPPFLAGS = \
-DGTK_COMPILATION \
$(AM_CPPFLAGS)
libgail_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \
libgtka11y_la_CFLAGS = \
$(GTK_DEP_CFLAGS) \
$(GTK_DEBUG_FLAGS) \
$(AM_CFLAGS)
libgail_la_LIBADD = \
$(GTK_DEP_LIBS) \
libgtka11y_la_LIBADD = \
$(GTK_DEP_LIBS) \
$(INTLLIBS)
libgail_la_LDFLAGS = \
libgtka11y_la_LDFLAGS = \
$(LDFLAGS)
dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.vcxproj ../../build/win32/vs10/libgail.vcxproj.filters
../../build/win32/vs9/libgail.vcproj: ../../build/win32/vs9/libgail.vcprojin
@ -145,7 +145,7 @@ dist-hook: ../../build/win32/vs9/libgail.vcproj ../../build/win32/vs10/libgail.v
done >libgail.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/libgail.vcprojin >$@
rm libgail.sourcefiles
../../build/win32/vs10/libgail.vcxproj: ../../build/win32/vs10/libgail.vcxprojin
for F in $(libgail_la_SOURCES); do \
case $$F in \

17
gtk/a11y/gail.c → gtk/a11y/gtkaccessibility.c
View File

@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library
/* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc.
*
* This library is free software; you can redistribute it and/or
@ -17,7 +17,7 @@
#include "config.h"
#include "gail.h"
#include "gtkaccessibility.h"
#include <stdio.h>
#include <stdlib.h>
@ -66,7 +66,7 @@ static void gail_focus_tracker_init (void);
static void gail_focus_object_destroyed (gpointer data);
static void gail_focus_tracker (AtkObject *object);
static void gail_set_focus_widget (GtkWidget *focus_widget,
GtkWidget *widget);
GtkWidget *widget);
static void gail_set_focus_object (AtkObject *focus_obj,
AtkObject *obj);
@ -75,14 +75,14 @@ static GtkWidget* next_focus_widget = NULL;
static gboolean was_deselect = FALSE;
static GtkWidget* subsequent_focus_widget = NULL;
static GtkWidget* focus_before_menu = NULL;
static guint focus_notify_handler = 0;
static guint focus_notify_handler = 0;
static guint focus_tracker_id = 0;
static GQuark quark_focus_object = 0;
static int initialized = FALSE;
static AtkObject*
gail_get_accessible_for_widget (GtkWidget *widget,
gboolean *transient)
get_accessible_for_widget (GtkWidget *widget,
gboolean *transient)
{
AtkObject *obj = NULL;
@ -516,13 +516,13 @@ gail_focus_notify (GtkWidget *widget)
else
{
if (_focus_widget)
atk_obj = gail_get_accessible_for_widget (_focus_widget, &transient);
atk_obj = get_accessible_for_widget (_focus_widget, &transient);
else
atk_obj = NULL;
/*
* Do not report focus on redundant object
*/
if (atk_obj &&
if (atk_obj &&
(atk_object_get_role(atk_obj) != ATK_ROLE_REDUNDANT_OBJECT))
atk_focus_tracker_notify (atk_obj);
if (atk_obj && transient)
@ -816,7 +816,6 @@ _gtk_accessibility_shutdown (void)
void
_gtk_accessibility_init (void)
{
if (initialized)
return;

12
gtk/a11y/gail.h → gtk/a11y/gtkaccessibility.h
View File

@ -1,4 +1,4 @@
/* GAIL - The GNOME Accessibility Implementation Library
/* GTK+ - accessibility implementations
* Copyright 2001 Sun Microsystems Inc.
*
* This library is free software; you can redistribute it and/or
@ -15,16 +15,16 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_GAIL_H__
#define __GTK_GAIL_H__
#ifndef __GTK_ACCESSIBILITY_H__
#define __GTK_ACCESSIBILITY_H__
#include <glib.h>
G_BEGIN_DECLS
void _gtk_accessibility_shutdown (void);
void _gtk_accessibility_init (void);
void _gtk_accessibility_shutdown (void);
void _gtk_accessibility_init (void);
G_END_DECLS
#endif /* __GTK_GAIL_H__ */
#endif /* __GTK_ACCESSIBILITY_H__ */

2
gtk/gtkmain.c
View File

@ -128,7 +128,7 @@
#include "gtkwidgetprivate.h"
#include "gtkwindowprivate.h"
#include "a11y/gail.h"
#include "a11y/gtkaccessibility.h"
#include "a11y/gailutil.h"
/* Private type definitions