diff options
author | Tor Lillqvist <tml@iki.fi> | 2003-02-25 22:06:37 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2003-02-25 22:06:37 +0000 |
commit | 7667bbd34aa6278f7a8f83e7acf798b15adc0fd3 (patch) | |
tree | 603e065bdfec0441a0fb5a160c9e2df7fab41b27 | |
parent | bda58843f3f1d48842144720589de162379ea4ed (diff) | |
download | atk-7667bbd34aa6278f7a8f83e7acf798b15adc0fd3.tar.gz |
Dist atk-zip.sh.in, not atk-zip.sh.
2003-02-25 Tor Lillqvist <tml@iki.fi>
* Makefile.am (EXTRA_DIST): Dist atk-zip.sh.in, not atk-zip.sh.
* atk/atk.def: Add a couple of 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: Generate 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.
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | atk/Makefile.am | 11 | ||||
-rw-r--r-- | atk/atk.def | 5 | ||||
-rw-r--r-- | atk/atk.rc.in | 30 | ||||
-rwxr-xr-x | atk/atkobject.c | 25 | ||||
-rw-r--r-- | configure.in | 1 |
7 files changed, 90 insertions, 2 deletions
@@ -1,3 +1,21 @@ +2003-02-25 Tor Lillqvist <tml@iki.fi> + + * Makefile.am (EXTRA_DIST): Dist atk-zip.sh.in, not atk-zip.sh. + + * atk/atk.def: Add a couple of 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: Generate 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-02-23 Abel Cheung <maddog@linux.org.hk> * configure.in: Added "mk" 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/Makefile.am b/atk/Makefile.am index 4e19235..40e1c6f 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -2,11 +2,14 @@ # which are more like other make's VPATH. GPATH = $(srcdir) -EXTRA_DIST = atk.def +EXTRA_DIST = atk.def atk.rc atk.rc.in + if OS_WIN32 export_symbols = -export-symbols atk.def no_undefined = -no-undefined +atk_win32res = atk-win32res.lo + install-libtool-import-lib: $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir) uninstall-libtool-import-lib: @@ -62,6 +65,9 @@ libatk_1_0_la_SOURCES = \ atkvalue.c \ $(atk_built_cfiles) +libatk_1_0_la_LIBADD = $(atk_win32res) +libatk_1_0_la_DEPENDENCIES = $(atk_win32res) + EXTRA_DIST += atkmarshal.list \ atkintl.h @@ -118,6 +124,9 @@ libatkinclude_HEADERS = \ $(libatk_1_0_la_OBJECTS): atkmarshal.c atkmarshal.h $(atk_built_headers) +atk-win32res.lo: atk.rc + $(top_srcdir)/../glib/build/win32/lt-compile-resource atk.rc atk-win32res.lo + atkmarshal.h: @REBUILD@ stamp-atkmarshal.h @true stamp-atkmarshal.h: atkmarshal.list diff --git a/atk/atk.def b/atk/atk.def index 29fb431..3125cc5 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 @@ -115,6 +119,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 72923de..1cf28fe 100755 --- a/atk/atkobject.c +++ b/atk/atkobject.c @@ -21,6 +21,14 @@ #include <glib-object.h> +#ifdef G_OS_WIN32 +#define STRICT +#include <windows.h> +#undef STRICT +#undef FOCUS_EVENT /* <windows.h> pollutes the namespace + * like a six hundred pound gorilla */ +#endif + #include "atk.h" #include "atkmarshal.h" #include "atk-enum-types.h" @@ -1178,6 +1186,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 diff --git a/configure.in b/configure.in index 223e2e1..4ca9584 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 |