X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilesel.h;h=75f65a16d10f5e3b61729d29c85bfb62002a34a5;hb=5c327ecbe573c60de2265a9622e569fd52943768;hp=d66d60a09ba2613de85f13b13775547f7780158f;hpb=e5d1ea8cfefac95f9011fffcff66345e4d2de70d;p=~andy%2Fgtk

diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index d66d60a09..75f65a16d 100644
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -24,6 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 #ifndef __GTK_FILESEL_H__
 #define __GTK_FILESEL_H__
 
@@ -32,17 +34,15 @@
 #include <gtk/gtkdialog.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_FILE_SELECTION            (gtk_file_selection_get_type ())
-#define GTK_FILE_SELECTION(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelection))
-#define GTK_FILE_SELECTION_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
-#define GTK_IS_FILE_SELECTION(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_FILE_SELECTION))
-#define GTK_IS_FILE_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SELECTION))
-#define GTK_FILE_SELECTION_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
+#define GTK_FILE_SELECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelection))
+#define GTK_FILE_SELECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
+#define GTK_IS_FILE_SELECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FILE_SELECTION))
+#define GTK_IS_FILE_SELECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_SELECTION))
+#define GTK_FILE_SELECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_SELECTION, GtkFileSelectionClass))
 
 
 typedef struct _GtkFileSelection       GtkFileSelection;
@@ -50,8 +50,10 @@ typedef struct _GtkFileSelectionClass  GtkFileSelectionClass;
 
 struct _GtkFileSelection
 {
+  /*< private >*/
   GtkDialog parent_instance;
 
+  /*< public >*/
   GtkWidget *dir_list;
   GtkWidget *file_list;
   GtkWidget *selection_entry;
@@ -75,6 +77,7 @@ struct _GtkFileSelection
   GtkWidget *button_area;
   GtkWidget *action_area;
 
+  /*< private >*/
   GPtrArray *selected_names;
   gchar     *last_selected;
 };
@@ -91,16 +94,17 @@ struct _GtkFileSelectionClass
 };
 
 
-GtkType    gtk_file_selection_get_type            (void) G_GNUC_CONST;
+#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,
@@ -114,9 +118,10 @@ 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__ */
+
+#endif /* GTK_DISABLE_DEPRECATED */