atk r1249 - in trunk: . atk docs/tmpl

[liyuan svn gnome org]

Author: liyuan
Date: Thu Jun 19 08:13:52 2008
New Revision: 1249
URL: http://svn.gnome.org/viewvc/atk?rev=1249&view=rev

Log:
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.


Added:
   trunk/atk/atk.symbols
      - copied, changed from r1248, /trunk/atk/atk.def
Removed:
   trunk/atk/atk.def
Modified:
   trunk/ChangeLog
   trunk/atk/Makefile.am
   trunk/atk/atkhyperlink.h
   trunk/atk/atkobject.h
   trunk/docs/tmpl/atkhyperlink.sgml
   trunk/docs/tmpl/atkobject.sgml

Modified: trunk/atk/Makefile.am
==============================================================================
--- trunk/atk/Makefile.am	(original)
+++ trunk/atk/Makefile.am	Thu Jun 19 08:13:52 2008
@@ -11,6 +11,7 @@
 INCLUDES = \
 	-I$(top_srcdir)		\
 	-DG_DISABLE_DEPRECATED	\
+	-DATK_DISABLE_DEPRECATED	\
 	-DATK_COMPILATION	\
 	-DATK_LOCALEDIR="\"$(datadir)/locale\""	\
 	$(DEP_CFLAGS)
@@ -136,9 +137,13 @@
 # ---------- 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:

Copied: trunk/atk/atk.symbols (from r1248, /trunk/atk/atk.def)
==============================================================================
--- /trunk/atk/atk.def	(original)
+++ trunk/atk/atk.symbols	Thu Jun 19 08:13:52 2008
@@ -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 @@
 	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 @@
 	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

Modified: trunk/atk/atkhyperlink.h
==============================================================================
--- trunk/atk/atkhyperlink.h	(original)
+++ trunk/atk/atkhyperlink.h	Thu Jun 19 08:13:52 2008
@@ -97,7 +97,9 @@
 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
 

Modified: trunk/atk/atkobject.h
==============================================================================
--- trunk/atk/atkobject.h	(original)
+++ trunk/atk/atkobject.h	Thu Jun 19 08:13:52 2008
@@ -543,8 +543,10 @@
                                                                    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);

Modified: trunk/docs/tmpl/atkhyperlink.sgml
==============================================================================
--- trunk/docs/tmpl/atkhyperlink.sgml	(original)
+++ trunk/docs/tmpl/atkhyperlink.sgml	Thu Jun 19 08:13:52 2008
@@ -134,5 +134,6 @@
 
 @link_: 
 @Returns: 
+ Deprecated: Please use ATK_STATE_SELECTED to indicate when a hyperlink within a Hypertext container is selected.
 
 

Modified: trunk/docs/tmpl/atkobject.sgml
==============================================================================
--- trunk/docs/tmpl/atkobject.sgml	(original)
+++ trunk/docs/tmpl/atkobject.sgml	Thu Jun 19 08:13:52 2008
@@ -404,6 +404,7 @@
 
 @accessible: 
 @Returns: 
+ Deprecated: Use atk_component_get_layer instead.
 
 
 <!-- ##### FUNCTION atk_object_get_mdi_zorder ##### -->
@@ -413,6 +414,7 @@
 
 @accessible: 
 @Returns: 
+ Deprecated: Use atk_component_get_mdi_zorder instead.
 
 
 <!-- ##### FUNCTION atk_object_get_role ##### -->