summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--gtk/gtk.symbols62
-rw-r--r--gtk/gtkaccelmap.c2
-rw-r--r--gtk/gtkfilechooser.c2
-rw-r--r--gtk/gtkfilesel.c4
-rw-r--r--gtk/gtkiconfactory.c10
-rw-r--r--gtk/gtkicontheme.c12
-rw-r--r--gtk/gtkimage.c2
-rw-r--r--gtk/gtkrc.c2
-rw-r--r--gtk/gtkuimanager.c2
-rw-r--r--gtk/gtkwindow.c2
-rwxr-xr-xgtk/makegtkalias.pl7
12 files changed, 103 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index e0c48e3559..2f45f7563d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+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.
+
2008-08-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Its g_content_type_from_mime_type, not
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index e505d0286b..d64be51c45 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -113,7 +113,9 @@ gtk_accel_map_foreach
gtk_accel_map_foreach_unfiltered
gtk_accel_map_get
gtk_accel_map_get_type G_GNUC_CONST
+#ifndef _WIN64
gtk_accel_map_load PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_accel_map_load_utf8
#endif
@@ -121,7 +123,9 @@ gtk_accel_map_load_fd
gtk_accel_map_load_scanner
gtk_accel_map_lock_path
gtk_accel_map_lookup_entry
+#ifndef _WIN64
gtk_accel_map_save PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_accel_map_save_utf8
#endif
@@ -1362,14 +1366,18 @@ gtk_expander_set_use_underline
#if IN_HEADER(__GTK_FILE_CHOOSER_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_C__)
gtk_file_chooser_add_filter
+#ifndef _WIN64
gtk_file_chooser_add_shortcut_folder PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_add_shortcut_folder_utf8
#endif
gtk_file_chooser_add_shortcut_folder_uri
gtk_file_chooser_error_quark
gtk_file_chooser_get_action
+#ifndef _WIN64
gtk_file_chooser_get_current_folder PRIVATE
+#endif
gtk_file_chooser_get_current_folder_file
#ifdef G_OS_WIN32
gtk_file_chooser_get_current_folder_utf8
@@ -1377,11 +1385,15 @@ gtk_file_chooser_get_current_folder_utf8
gtk_file_chooser_get_current_folder_uri
gtk_file_chooser_get_extra_widget
gtk_file_chooser_get_file
+#ifndef _WIN64
gtk_file_chooser_get_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_get_filename_utf8
#endif
+#ifndef _WIN64
gtk_file_chooser_get_filenames PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_get_filenames_utf8
#endif
@@ -1389,7 +1401,9 @@ gtk_file_chooser_get_files
gtk_file_chooser_get_filter
gtk_file_chooser_get_local_only
gtk_file_chooser_get_preview_file
+#ifndef _WIN64
gtk_file_chooser_get_preview_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_get_preview_filename_utf8
#endif
@@ -1405,26 +1419,34 @@ gtk_file_chooser_get_uri
gtk_file_chooser_get_uris
gtk_file_chooser_get_use_preview_label
gtk_file_chooser_list_filters
+#ifndef _WIN64
gtk_file_chooser_list_shortcut_folders PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_list_shortcut_folders_utf8
#endif
gtk_file_chooser_list_shortcut_folder_uris
gtk_file_chooser_remove_filter
+#ifndef _WIN64
gtk_file_chooser_remove_shortcut_folder PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_remove_shortcut_folder_utf8
#endif
gtk_file_chooser_remove_shortcut_folder_uri
gtk_file_chooser_select_all
gtk_file_chooser_select_file
+#ifndef _WIN64
gtk_file_chooser_select_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_select_filename_utf8
#endif
gtk_file_chooser_select_uri
gtk_file_chooser_set_action
+#ifndef _WIN64
gtk_file_chooser_set_current_folder PRIVATE
+#endif
gtk_file_chooser_set_current_folder_file
#ifdef G_OS_WIN32
gtk_file_chooser_set_current_folder_utf8
@@ -1433,7 +1455,9 @@ gtk_file_chooser_set_current_folder_uri
gtk_file_chooser_set_current_name
gtk_file_chooser_set_extra_widget
gtk_file_chooser_set_file
+#ifndef _WIN64
gtk_file_chooser_set_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_set_filename_utf8
#endif
@@ -1447,7 +1471,9 @@ gtk_file_chooser_set_uri
gtk_file_chooser_set_use_preview_label
gtk_file_chooser_unselect_all
gtk_file_chooser_unselect_file
+#ifndef _WIN64
gtk_file_chooser_unselect_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_chooser_unselect_filename_utf8
#endif
@@ -1511,11 +1537,15 @@ gtk_file_filter_set_name
#if IN_FILE(__GTK_FILESEL_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_file_selection_complete
+#ifndef _WIN64
gtk_file_selection_get_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_selection_get_filename_utf8
#endif
+#ifndef _WIN64
gtk_file_selection_get_selections PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_selection_get_selections_utf8
#endif
@@ -1523,7 +1553,9 @@ gtk_file_selection_get_select_multiple
gtk_file_selection_get_type G_GNUC_CONST
gtk_file_selection_hide_fileop_buttons
gtk_file_selection_new
+#ifndef _WIN64
gtk_file_selection_set_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_file_selection_set_filename_utf8
#endif
@@ -1739,7 +1771,9 @@ gtk_icon_source_copy
gtk_icon_source_free
gtk_icon_source_get_direction
gtk_icon_source_get_direction_wildcarded
+#ifndef _WIN64
gtk_icon_source_get_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_source_get_filename_utf8
#endif
@@ -1753,7 +1787,9 @@ gtk_icon_source_get_type G_GNUC_CONST
gtk_icon_source_new
gtk_icon_source_set_direction
gtk_icon_source_set_direction_wildcarded
+#ifndef _WIN64
gtk_icon_source_set_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_source_set_filename_utf8
#endif
@@ -1776,7 +1812,9 @@ gtk_icon_info_get_base_size
gtk_icon_info_get_builtin_pixbuf
gtk_icon_info_get_display_name
gtk_icon_info_get_embedded_rect
+#ifndef _WIN64
gtk_icon_info_get_filename PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_info_get_filename_utf8
#endif
@@ -1784,7 +1822,9 @@ gtk_icon_info_get_type G_GNUC_CONST
gtk_icon_info_load_icon
gtk_icon_info_set_raw_coordinates
gtk_icon_theme_add_builtin_icon
+#ifndef _WIN64
gtk_icon_theme_append_search_path PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_theme_append_search_path_utf8
#endif
@@ -1793,7 +1833,9 @@ gtk_icon_theme_get_default
gtk_icon_theme_get_example_icon_name
gtk_icon_theme_get_for_screen
gtk_icon_theme_get_icon_sizes
+#ifndef _WIN64
gtk_icon_theme_get_search_path PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_theme_get_search_path_utf8
#endif
@@ -1806,14 +1848,18 @@ gtk_icon_theme_lookup_icon
gtk_icon_theme_lookup_by_gicon
gtk_icon_theme_choose_icon
gtk_icon_theme_new
+#ifndef _WIN64
gtk_icon_theme_prepend_search_path PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_theme_prepend_search_path_utf8
#endif
gtk_icon_theme_rescan_if_needed
gtk_icon_theme_set_custom_theme
gtk_icon_theme_set_screen
+#ifndef _WIN64
gtk_icon_theme_set_search_path PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_icon_theme_set_search_path_utf8
#endif
@@ -1902,7 +1948,9 @@ gtk_image_get_storage_type
gtk_image_get_type G_GNUC_CONST
gtk_image_new
gtk_image_new_from_animation
+#ifndef _WIN64
gtk_image_new_from_file PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_image_new_from_file_utf8
#endif
@@ -1914,7 +1962,9 @@ gtk_image_new_from_pixmap
gtk_image_new_from_stock
gtk_image_new_from_gicon
gtk_image_set_from_animation
+#ifndef _WIN64
gtk_image_set_from_file PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_image_set_from_file_utf8
#endif
@@ -3093,7 +3143,9 @@ gtk_rc_add_class_style
gtk_rc_add_widget_class_style
gtk_rc_add_widget_name_style
#endif
+#ifndef _WIN64
gtk_rc_add_default_file PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_rc_add_default_file_utf8
#endif
@@ -3106,7 +3158,9 @@ gtk_rc_get_module_dir
gtk_rc_get_style
gtk_rc_get_style_by_paths
gtk_rc_get_theme_dir
+#ifndef _WIN64
gtk_rc_parse PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_rc_parse_utf8
#endif
@@ -3119,7 +3173,9 @@ gtk_rc_reparse_all
gtk_rc_reparse_all_for_settings
gtk_rc_reset_styles
gtk_rc_scanner_new
+#ifndef _WIN64
gtk_rc_set_default_files PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_rc_set_default_files_utf8
#endif
@@ -4587,7 +4643,9 @@ gtk_type_class
#if IN_HEADER(__GTK_UI_MANAGER_H__)
#if IN_FILE(__GTK_UI_MANAGER_C__)
gtk_ui_manager_add_ui
+#ifndef _WIN64
gtk_ui_manager_add_ui_from_file PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_ui_manager_add_ui_from_file_utf8
#endif
@@ -4913,7 +4971,9 @@ gtk_window_set_decorated
gtk_window_set_deletable
gtk_window_set_default
gtk_window_set_default_icon
+#ifndef _WIN64
gtk_window_set_default_icon_from_file PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_window_set_default_icon_from_file_utf8
#endif
@@ -4929,7 +4989,9 @@ gtk_window_set_geometry_hints
gtk_window_set_gravity
gtk_window_set_has_frame
gtk_window_set_icon
+#ifndef _WIN64
gtk_window_set_icon_from_file PRIVATE
+#endif
#ifdef G_OS_WIN32
gtk_window_set_icon_from_file_utf8
#endif
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index f33d78fb11..b9f41ff61e 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -1005,7 +1005,7 @@ do_accel_map_changed (AccelEntry *entry)
entry->accel_mods);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef gtk_accel_map_load
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 1ed1eb9cab..a6d2b77467 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -1959,7 +1959,7 @@ gtk_file_chooser_get_do_overwrite_confirmation (GtkFileChooser *chooser)
return do_overwrite_confirmation;
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 6bad09c499..00b050e5d7 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -3929,7 +3929,7 @@ cmpl_strerror (gint err)
return g_strerror (err);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
@@ -3983,7 +3983,7 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel)
return selections;
}
-#endif /* G_OS_WIN32 */
+#endif /* G_OS_WIN32 && !_WIN64 */
#define __GTK_FILESEL_C__
#include "gtkaliasdef.c"
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 43773e4f91..d7818398d6 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -75,7 +75,7 @@ struct _GtkIconSource
guint any_state : 1;
guint any_size : 1;
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* System codepage version of filename, for DLL ABI backward
* compatibility functions.
*/
@@ -1925,7 +1925,7 @@ gtk_icon_source_copy (const GtkIconSource *source)
break;
case GTK_ICON_SOURCE_FILENAME:
copy->source.filename = g_strdup (copy->source.filename);
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
copy->cp_filename = g_strdup (copy->cp_filename);
#endif
if (copy->filename_pixbuf)
@@ -1986,7 +1986,7 @@ icon_source_clear (GtkIconSource *source)
case GTK_ICON_SOURCE_FILENAME:
g_free (source->source.filename);
source->source.filename = NULL;
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
g_free (source->cp_filename);
source->cp_filename = NULL;
#endif
@@ -2030,7 +2030,7 @@ gtk_icon_source_set_filename (GtkIconSource *source,
{
source->type = GTK_ICON_SOURCE_FILENAME;
source->source.filename = g_strdup (filename);
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
source->cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
#endif
}
@@ -2980,7 +2980,7 @@ gtk_icon_factory_buildable_custom_tag_end (GtkBuildable *buildable,
}
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
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 */
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 56e3171145..37a728ecec 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -2335,7 +2335,7 @@ gtk_image_get_pixel_size (GtkImage *image)
return priv->pixel_size;
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef gtk_image_new_from_file
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 89a6c45276..9a56e708c0 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -4859,7 +4859,7 @@ _gtk_rc_match_widget_class (GSList *list,
return match_widget_class_recursive (list, length, path, path_reversed);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* DLL ABI stability backward compatibility versions */
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index cef27b6686..01b2d9c665 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2986,7 +2986,7 @@ gtk_ui_manager_get_ui (GtkUIManager *self)
return g_string_free (buffer, FALSE);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef gtk_ui_manager_add_ui_from_file
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c020354c25..a14b3b552b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8186,7 +8186,7 @@ gtk_window_set_auto_startup_notification (gboolean setting)
disable_startup_notification = !setting;
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef gtk_window_set_icon_from_file
diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
index a38afbe01b..e3b6e2504d 100755
--- a/gtk/makegtkalias.pl
+++ b/gtk/makegtkalias.pl
@@ -90,6 +90,13 @@ while (<>) {
next;
}
+ if ($_ =~ /^\#ifndef\s+_WIN64/)
+ {
+ print $_;
+
+ next;
+ }
+
if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER)/)
{
print $_;
View Lorry Controller Status