diff options
author | Li Yuan <li.yuan@sun.com> | 2008-06-19 08:13:52 +0000 |
---|---|---|
committer | Li Yuan <liyuan@src.gnome.org> | 2008-06-19 08:13:52 +0000 |
commit | 0c469d095284d062b512d0e9f4ea436b7d725f5b (patch) | |
tree | c521a494607b65caee140965d09528e6b3dae635 | |
parent | c28f5c56779bea856f207e746d63218b7fde51c0 (diff) | |
download | atk-0c469d095284d062b512d0e9f4ea436b7d725f5b.tar.gz |
Patch from Mike Gorse <mgorse@novell.com>. Bug #526752. Mark deprecated
2008-06-19 Li Yuan <li.yuan@sun.com>
* atk/Makefile.am:
* atk/atk.def:
* atk/atk.symbols:
* atk/atkhyperlink.h:
* atk/atkobject.h:
* docs/tmpl/atkhyperlink.sgml:
* docs/tmpl/atkobject.sgml:
Patch from Mike Gorse <mgorse@novell.com>. Bug #526752.
Mark deprecated symbols with ATK_DISABLE_DEPRECATED.
svn path=/trunk/; revision=1249
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | atk/Makefile.am | 5 | ||||
-rw-r--r-- | atk/atk.symbols (renamed from atk/atk.def) | 8 | ||||
-rwxr-xr-x | atk/atkhyperlink.h | 2 | ||||
-rwxr-xr-x | atk/atkobject.h | 2 | ||||
-rw-r--r-- | docs/tmpl/atkhyperlink.sgml | 1 | ||||
-rw-r--r-- | docs/tmpl/atkobject.sgml | 2 |
7 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,15 @@ +2008-06-19 Li Yuan <li.yuan@sun.com> + + * atk/Makefile.am: + * atk/atk.def: + * atk/atk.symbols: + * atk/atkhyperlink.h: + * atk/atkobject.h: + * docs/tmpl/atkhyperlink.sgml: + * docs/tmpl/atkobject.sgml: + Patch from Mike Gorse <mgorse@novell.com>. Bug #526752. + Mark deprecated symbols with ATK_DISABLE_DEPRECATED. + 2008-06-05 Michael Natterer <mitch@imendio.com> Bug #535704: diff --git a/atk/Makefile.am b/atk/Makefile.am index 7bb3155..ab8c3be 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -11,6 +11,7 @@ endif INCLUDES = \ -I$(top_srcdir) \ -DG_DISABLE_DEPRECATED \ + -DATK_DISABLE_DEPRECATED \ -DATK_COMPILATION \ -DATK_LOCALEDIR="\"$(datadir)/locale\"" \ $(DEP_CFLAGS) @@ -136,9 +137,13 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile # ---------- Win32 stuff ---------- if OS_WIN32 +atk_def = atk.def libatk_1_0_la_LDFLAGS += -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o libatk_1_0_la_DEPENDENCIES = atk-win32-res.o +atk.def: atk.symbols + (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > atk.def + install-def-file: $(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def uninstall-def-file: diff --git a/atk/atk.def b/atk/atk.symbols index 4b9c0ec..1500873 100644 --- a/atk/atk.def +++ b/atk/atk.symbols @@ -1,4 +1,6 @@ -EXPORTS +/* + * This list defines the ATK ABI. It is used to generate the atk.def file. + */ atk_action_do_action atk_action_get_description atk_action_get_keybinding @@ -59,7 +61,9 @@ EXPORTS atk_hyperlink_get_type atk_hyperlink_get_uri atk_hyperlink_is_inline +#ifndef ATK_DISABLE_DEPRECATED atk_hyperlink_is_selected_link +#endif /* ATK_DISABLE_DEPRECATED */ atk_hyperlink_is_valid atk_hypertext_get_link atk_hypertext_get_link_index @@ -94,8 +98,10 @@ EXPORTS atk_object_get_attributes atk_object_get_description atk_object_get_index_in_parent +#ifndef ATK_DISABLE_DEPRECATED atk_object_get_layer atk_object_get_mdi_zorder +#endif /* ATK_DISABLE_DEPRECATED */ atk_object_get_n_accessible_children atk_object_get_name atk_object_get_parent diff --git a/atk/atkhyperlink.h b/atk/atkhyperlink.h index 01bab83..dff0c8a 100755 --- a/atk/atkhyperlink.h +++ b/atk/atkhyperlink.h @@ -97,7 +97,9 @@ gboolean atk_hyperlink_is_valid (AtkHyperlink *link_); gboolean atk_hyperlink_is_inline (AtkHyperlink *link_); gint atk_hyperlink_get_n_anchors (AtkHyperlink *link_); +#ifndef ATK_DISABLE_DEPRECATED gboolean atk_hyperlink_is_selected_link (AtkHyperlink *link_); +#endif /* ATK_DISABLE_DEPRECATED */ G_END_DECLS diff --git a/atk/atkobject.h b/atk/atkobject.h index 39499e7..bfd94f3 100755 --- a/atk/atkobject.h +++ b/atk/atkobject.h @@ -543,8 +543,10 @@ AtkObject* atk_object_ref_accessible_child (AtkObject *ac gint i); AtkRelationSet* atk_object_ref_relation_set (AtkObject *accessible); AtkRole atk_object_get_role (AtkObject *accessible); +#ifndef ATK_DISABLE_DEPRECATED AtkLayer atk_object_get_layer (AtkObject *accessible); gint atk_object_get_mdi_zorder (AtkObject *accessible); +#endif /* ATK_DISABLE_DEPRECATED */ AtkAttributeSet* atk_object_get_attributes (AtkObject *accessible); AtkStateSet* atk_object_ref_state_set (AtkObject *accessible); gint atk_object_get_index_in_parent (AtkObject *accessible); diff --git a/docs/tmpl/atkhyperlink.sgml b/docs/tmpl/atkhyperlink.sgml index 12ed025..457c85a 100644 --- a/docs/tmpl/atkhyperlink.sgml +++ b/docs/tmpl/atkhyperlink.sgml @@ -134,5 +134,6 @@ The signal link-activated is emitted when a link is activated. @link_: @Returns: +@Deprecated: Please use ATK_STATE_SELECTED to indicate when a hyperlink within a Hypertext container is selected. diff --git a/docs/tmpl/atkobject.sgml b/docs/tmpl/atkobject.sgml index 582f80d..524db7c 100644 --- a/docs/tmpl/atkobject.sgml +++ b/docs/tmpl/atkobject.sgml @@ -404,6 +404,7 @@ atk_object_connect_property_change_handler(). @accessible: @Returns: +@Deprecated: Use atk_component_get_layer instead. <!-- ##### FUNCTION atk_object_get_mdi_zorder ##### --> @@ -413,6 +414,7 @@ atk_object_connect_property_change_handler(). @accessible: @Returns: +@Deprecated: Use atk_component_get_mdi_zorder instead. <!-- ##### FUNCTION atk_object_get_role ##### --> |