Set gettext_initialized.

2003-06-13  Tor Lillqvist  <tml@iki.fi>

	* atk/atkobject.c (atk_role_get_localized_name): Set
	gettext_initialized.

	* atk-zip.sh.in (DEVZIP): libtool 1.5 installs DLLs in the bin
	directory, so look there, too. Include the message catalogs.

	Merge from HEAD:

	* Makefile.am (EXTRA_DIST): Dist atk-zip.sh.in, not atk-zip.sh.

	* atk/atk.def: Add missing entries, thanks to Cedric Gustin.

	* atk/atk.rc.in: New file, for version info in the DLL on
	Windows. Similar as in GLib, GTK, etc.

	* configure.in: Expand atk/atk.rc.

	* atk/Makefile.am: Use atk.rc on Windows.
	(EXTRA_DIST): Distribute atk.rc.in.

	* atk/atkobject.c: On Windows, don't use hardcoded ATKLOCALEDIR,
	but deduce it from DLL location, like GLib, GTK etc do.

8 files changed, 104 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e9985c..44c7bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2003-06-13  Tor Lillqvist  <tml@iki.fi>
+
+	* atk/atkobject.c (atk_role_get_localized_name): Set
+	gettext_initialized.
+
+	* atk-zip.sh.in (DEVZIP): libtool 1.5 installs DLLs in the bin
+	directory, so look there, too. Include the message catalogs.
+
+	Merge from HEAD:
+
+	* Makefile.am (EXTRA_DIST): Dist atk-zip.sh.in, not atk-zip.sh.
+
+	* atk/atk.def: Add missing entries, thanks to Cedric Gustin.
+
+	* atk/atk.rc.in: New file, for version info in the DLL on
+	Windows. Similar as in GLib, GTK, etc.
+
+	* configure.in: Expand atk/atk.rc.
+
+	* atk/Makefile.am: Use atk.rc on Windows.
+	(EXTRA_DIST): Distribute atk.rc.in.
+
+	* atk/atkobject.c: On Windows, don't use hardcoded ATKLOCALEDIR,
+	but deduce it from DLL location, like GLib, GTK etc do.
+
 2003-05-20  Telsa Gwynne  <hobbit@aloss.ukuu.org.uk>
 
 	* configure.in: Added cy to ALL_LINGUAS
diff --git a/Makefile.am b/Makefile.am
index fe970b1..d21f511 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = 			\
 	atk.pc.in		\
 	atk.spec.in		\
 	atk.spec		\
-	atk-zip.sh
+	atk-zip.sh.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = atk.pc
diff --git a/atk-zip.sh.in b/atk-zip.sh.in
index 68bf2f1..21242c0 100755
--- a/atk-zip.sh.in
+++ b/atk-zip.sh.in
@@ -4,13 +4,19 @@
 
 ZIP=/tmp/atk-@ATK_VERSION@-`date +%Y%m%d`.zip
 DEVZIP=/tmp/atk-dev-@ATK_VERSION@-`date +%Y%m%d`.zip
-cd @prefix@
 
+cd @prefix@
 rm $ZIP
-zip -r $ZIP -@ <<EOF
-lib/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
+
+DLLDIR=lib
+[ -f bin/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
+
+zip $ZIP -@ <<EOF
+$DLLDIR/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
+zip $ZIP lib/locale/*/LC_MESSAGES/atk10.mo
+
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/atk-1.0
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 4e19235..5ce077d 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -2,11 +2,13 @@
 # which are more like other make's VPATH.
 GPATH = $(srcdir)
 
-EXTRA_DIST = atk.def
+EXTRA_DIST = atk.def atk.rc.in
 if OS_WIN32
 export_symbols = -export-symbols atk.def
 no_undefined = -no-undefined
 
+libatk_1_0_la_LIBADD += atk-win32res.lo
+
 install-libtool-import-lib:
 	$(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib:
@@ -16,6 +18,9 @@ install-libtool-import-lib:
 uninstall-libtool-import-lib:
 endif
 
+atk-win32res.lo: atk.rc
+	$(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@
+
 lib_LTLIBRARIES = libatk-1.0.la
 
 if MS_LIB_AVAILABLE
diff --git a/atk/atk.def b/atk/atk.def
index 29fb431..fc569f1 100644
--- a/atk/atk.def
+++ b/atk/atk.def
@@ -2,6 +2,7 @@ EXPORTS
 	atk_action_do_action
 	atk_action_get_description
 	atk_action_get_keybinding
+	atk_action_get_localized_name
 	atk_action_get_n_actions
 	atk_action_get_name
 	atk_action_get_type
@@ -13,6 +14,8 @@ EXPORTS
 	atk_component_add_focus_handler
 	atk_component_contains
 	atk_component_get_extents
+	atk_component_get_layer
+	atk_component_get_mdi_zorder
 	atk_component_get_position
 	atk_component_get_size
 	atk_component_get_type
@@ -67,6 +70,7 @@ EXPORTS
 	atk_no_op_object_factory_new
 	atk_no_op_object_get_type
 	atk_no_op_object_new
+	atk_object_add_relationship
 	atk_object_connect_property_change_handler
 	atk_object_factory_create_accessible
 	atk_object_factory_get_accessible_type
@@ -87,6 +91,7 @@ EXPORTS
 	atk_object_ref_relation_set
 	atk_object_ref_state_set
 	atk_object_remove_property_change_handler
+	atk_object_remove_relationship
 	atk_object_set_description
 	atk_object_set_name
 	atk_object_set_parent
@@ -115,6 +120,7 @@ EXPORTS
 	atk_remove_global_event_listener
 	atk_remove_key_event_listener
 	atk_role_for_name
+	atk_role_get_localized_name
 	atk_role_get_name
 	atk_role_get_type
 	atk_role_register
diff --git a/atk/atk.rc.in b/atk/atk.rc.in
new file mode 100644
index 0000000..bea0732
--- /dev/null
+++ b/atk/atk.rc.in
@@ -0,0 +1,30 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @ATK_MAJOR_VERSION@,@ATK_MINOR_VERSION@,@ATK_MICRO_VERSION@,BUILDNUMBER
+  PRODUCTVERSION @ATK_MAJOR_VERSION@,@ATK_MINOR_VERSION@,@ATK_MICRO_VERSION@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+	VALUE "CompanyName", "Sun Microsystems Inc."
+	VALUE "FileDescription", "atk"
+	VALUE "FileVersion", "@ATK_VERSION@.BUILDNUMBER"
+	VALUE "InternalName", "libatk-1.0-@LT_CURRENT_MINUS_AGE@"
+	VALUE "LegalCopyright", "Copyright © Sun Microsystems Inc."
+	VALUE "OriginalFilename", "libatk-1.0-@LT_CURRENT_MINUS_AGE@.dll"
+	VALUE "ProductName", "atk"
+	VALUE "ProductVersion", "@ATK_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
diff --git a/atk/atkobject.c b/atk/atkobject.c
index d4634c4..9c8561e 100755
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -21,6 +21,13 @@
 
 #include <glib-object.h>
 
+#ifdef G_OS_WIN32
+#define STRICT
+#include <windows.h>
+#undef STRICT
+#undef FOCUS_EVENT		/* <windows.h> pollutes the namespace */
+#endif
+
 #include "atk.h"
 #include "atkmarshal.h"
 #include "atk-enum-types.h"
@@ -1162,6 +1169,23 @@ atk_role_get_name (AtkRole role)
   return name;
 }
 
+#ifdef G_OS_WIN32
+
+#undef ATKLOCALEDIR
+
+#define ATKLOCALEDIR get_atk_locale_dir()
+
+G_WIN32_DLLMAIN_FOR_DLL_NAME(static, dll_name)
+
+static char *
+get_atk_locale_dir (void)
+{
+  return g_win32_get_package_installation_subdirectory
+    (GETTEXT_PACKAGE, dll_name, "lib/locale");
+}
+
+#endif
+
 /**
  * atk_role_get_localized_name:
  * @role: The #AtkRole whose localized name is required
@@ -1179,6 +1203,8 @@ atk_role_get_localized_name (AtkRole role)
 #ifdef ENABLE_NLS
   if (!gettext_initialized)
     {
+      gettext_initialized = TRUE;
+
       bindtextdomain (GETTEXT_PACKAGE, ATKLOCALEDIR);
 #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/configure.in b/configure.in
index 82b9f13..9090a1a 100644
--- a/configure.in
+++ b/configure.in
@@ -227,6 +227,7 @@ po/Makefile.in
 atk.pc
 atk-uninstalled.pc
 atk/Makefile
+atk/atk.rc
 tests/Makefile
 docs/Makefile
 atk.spec