diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-08-08 03:49:18 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-08-08 03:49:18 +0000 |
| commit | 729524185b209792ac25e91e8b59c25bcede74fa (patch) | |
| tree | a5886647cd2a45d46ee987f745c23fabfb4749f1 /gtk/gtkicontheme.c | |
| parent | 28e08b7e8d8e6b3a8ce5244bad384719c33318f6 (diff) | |
| download | gtk+-729524185b209792ac25e91e8b59c25bcede74fa.tar.gz | |
gtk/gtk.symbols gtk/makegtkalias.pl gtk/gtkaccelmap.c gtk/gtkfilechooser.c
2008-08-08 Tor Lillqvist <tml@novell.com>
* gtk/gtk.symbols
* gtk/makegtkalias.pl
* gtk/gtkaccelmap.c
* gtk/gtkfilechooser.c
* gtk/gtkfilesel.c
* gtk/gtkiconfactory.c
* gtk/gtkicontheme.c
* gtk/gtkimage.c
* gtk/gtkrc.c
* gtk/gtkuimanager.c
* gtk/gtkwindow.c: No need for the DLL ABI backward compatibility
functions on Win64.
svn path=/trunk/; revision=21040
Diffstat (limited to 'gtk/gtkicontheme.c')
| -rw-r--r-- | gtk/gtkicontheme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 82bf9615b8..04ef756ba4 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -110,7 +110,7 @@ struct _GtkIconInfo /* Information about the source */ gchar *filename; -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) /* System codepage version of filename, for DLL ABI backward * compatibility functions. */ @@ -1322,7 +1322,7 @@ choose_icon (GtkIconTheme *icon_theme, icon_info->filename = g_strdup (unthemed_icon->svg_filename); else if (unthemed_icon->no_svg_filename) icon_info->filename = g_strdup (unthemed_icon->no_svg_filename); -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename, -1, NULL, NULL, NULL); #endif @@ -2208,7 +2208,7 @@ theme_lookup_icon (IconTheme *theme, file = g_strconcat (icon_name, string_from_suffix (suffix), NULL); icon_info->filename = g_build_filename (min_dir->dir, file, NULL); g_free (file); -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) icon_info->cp_filename = g_locale_from_utf8 (icon_info->filename, -1, NULL, NULL, NULL); #endif @@ -2216,7 +2216,7 @@ theme_lookup_icon (IconTheme *theme, else { icon_info->filename = NULL; -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) icon_info->cp_filename = NULL; #endif } @@ -2674,7 +2674,7 @@ gtk_icon_info_free (GtkIconInfo *icon_info) return; g_free (icon_info->filename); -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) g_free (icon_info->cp_filename); #endif if (icon_info->loadable) @@ -3515,7 +3515,7 @@ gtk_icon_info_new_for_pixbuf (GtkIconTheme *icon_theme, return info; } -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) /* DLL ABI stability backward compatibility versions */ |