X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserdialog.h;h=6ce77e8828ef65057036ecc1bb740a97233177c0;hb=56bcb1933f6de613e5d8689e23420d47b65425c3;hp=d0ff1b2d1d49216cbecf01b0ebb0b3e1c51e00d9;hpb=b69987f217595e1d2a01ef65628c2fff701b91c1;p=~andy%2Fgtk

diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index d0ff1b2d1..6ce77e882 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -13,16 +13,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_FILE_CHOOSER_DIALOG_H__
 #define __GTK_FILE_CHOOSER_DIALOG_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkdialog.h>
-#include "gtkfilechooser.h"
+#include <gtk/gtkfilechooser.h>
 
 G_BEGIN_DECLS
 
@@ -33,15 +35,9 @@ G_BEGIN_DECLS
 #define GTK_IS_FILE_CHOOSER_DIALOG_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FILE_CHOOSER_DIALOG))
 #define GTK_FILE_CHOOSER_DIALOG_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogClass))
 
-typedef struct _GtkFileChooserDialog      GtkFileChooserDialog;
-typedef struct _GtkFileChooserDialogClass GtkFileChooserDialogClass;
-
+typedef struct _GtkFileChooserDialog        GtkFileChooserDialog;
 typedef struct _GtkFileChooserDialogPrivate GtkFileChooserDialogPrivate;
-
-struct _GtkFileChooserDialogClass
-{
-  GtkDialogClass parent_class;
-};
+typedef struct _GtkFileChooserDialogClass   GtkFileChooserDialogClass;
 
 struct _GtkFileChooserDialog
 {
@@ -50,18 +46,23 @@ struct _GtkFileChooserDialog
   GtkFileChooserDialogPrivate *priv;
 };
 
+struct _GtkFileChooserDialogClass
+{
+  GtkDialogClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
 GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;
 GtkWidget *gtk_file_chooser_dialog_new              (const gchar          *title,
 						     GtkWindow            *parent,
 						     GtkFileChooserAction  action,
 						     const gchar          *first_button_text,
-						     ...);
-GtkWidget *gtk_file_chooser_dialog_new_with_backend (const gchar          *title,
-						     GtkWindow            *parent,
-						     GtkFileChooserAction  action,
-						     const gchar          *backend,
-						     const gchar          *first_button_text,
-						     ...);
+						     ...) G_GNUC_NULL_TERMINATED;
 
 G_END_DECLS