Improve wording. String change! (#355128, David Lodge)

[~andy/gtk] / gtk / gtkfilesel.h

diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index 9f819a17f8275a503efb57c4fd818faeba1cebfd..e22eb77765070571728454480e5e1b8f54efadbf 100644 (file)
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkdialog.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_FILE_SELECTION            (gtk_file_selection_get_type ())
@@ -94,16 +92,17 @@ struct _GtkFileSelectionClass
 };
 
 
+#ifdef G_OS_WIN32
+/* Reserve old names for DLL ABI backward compatibility */
+#define gtk_file_selection_get_filename gtk_file_selection_get_filename_utf8
+#define gtk_file_selection_set_filename gtk_file_selection_set_filename_utf8
+#define gtk_file_selection_get_selections gtk_file_selection_get_selections_utf8
+#endif
+
 GType      gtk_file_selection_get_type            (void) G_GNUC_CONST;
 GtkWidget* gtk_file_selection_new                 (const gchar      *title);
 void       gtk_file_selection_set_filename        (GtkFileSelection *filesel,
                                                   const gchar      *filename);
-/* This function returns the selected filename in the C runtime's
- * multibyte string encoding, which may or may not be the same as that
- * used by GDK (UTF-8). To convert to UTF-8, call g_filename_to_utf8().
- * The returned string points to a statically allocated buffer and
- * should be copied away.
- */
 G_CONST_RETURN gchar* gtk_file_selection_get_filename        (GtkFileSelection *filesel);
 
 void      gtk_file_selection_complete            (GtkFileSelection *filesel,
@@ -117,9 +116,8 @@ void       gtk_file_selection_set_select_multiple (GtkFileSelection *filesel,
                                                   gboolean          select_multiple);
 gboolean   gtk_file_selection_get_select_multiple (GtkFileSelection *filesel);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_FILESEL_H__ */