diff options
author | Tor Lillqvist <tml@iki.fi> | 2004-12-12 21:09:13 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2004-12-12 21:09:13 +0000 |
commit | f3da17053918abe78db5f75e7d008e4c84c09570 (patch) | |
tree | 8ec4255ddb86a9d13de0e6012246a64f4cc671e3 /gtk/gtkuimanager.h | |
parent | f821217218c60a96cda40844fbef300b4b3d143b (diff) | |
download | gtk+-f3da17053918abe78db5f75e7d008e4c84c09570.tar.gz |
gtk/gtkaccelmap.[ch] gtk/gtkfilechooser.[ch] gtk/gtkfilesel.c
2004-12-12 Tor Lillqvist <tml@iki.fi>
* gtk/gtkaccelmap.[ch]
* gtk/gtkfilechooser.[ch]
* gtk/gtkfilesel.c
* gtk/gtkfilesystemwin32.c
* gtk/gtkiconfactory.[ch]
* gtk/gtkicontheme.[ch]
* gtk/gtkimage.[ch]
* gtk/gtkimmodule.c
* gtk/gtkmodules.c
* gtk/gtkrc.[ch]
* gtk/gtkuimanager.[ch]
* gtk/gtkwindow.[ch]
* gtk/updateiconcache.c
* gtk/gtk.symbols: Use gstdio wrappers. On Windows, convert
environment variables referring to pathnames from locale encoding
to UTF-8. As in GLib, in order to preserve Windows DLL ABI
stability, add binary compatibility versions of functions that
take file names as arguments, or return file names. Add a _utf8
suffix to the "real" such functions on Windows. The ABI
compatibility versions keep the old name.
* gtk/Makefile.am: Strip PRIVATE symbols from the GNU import
library.
* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Implement
file mapping on Win32.
* gtk/updateiconcache.c: Don't crash if invoked without
argument. Use binary mode when opening file.
* modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am: Install
gtkrc in correct place, in <datadir>/themes/MS-Windows/gtk-2.0.
Diffstat (limited to 'gtk/gtkuimanager.h')
-rw-r--r-- | gtk/gtkuimanager.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h index 931925f71c..7e1e6ead68 100644 --- a/gtk/gtkuimanager.h +++ b/gtk/gtkuimanager.h @@ -102,6 +102,11 @@ typedef enum { GTK_UI_MANAGER_ACCELERATOR = 1 << 8 } GtkUIManagerItemType; +#ifdef G_OS_WIN32 +/* Reserve old name for DLL ABI backward compatibility */ +#define gtk_ui_manager_add_ui_from_file gtk_ui_manager_add_ui_from_file_utf8 +#endif + GType gtk_ui_manager_get_type (void) G_GNUC_CONST; GtkUIManager *gtk_ui_manager_new (void); void gtk_ui_manager_set_add_tearoffs (GtkUIManager *self, |