AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Allow any GtkDialog that implements GtkFileChooser as dialog. (#335473,

Browse Source 
2006-12-20  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
        Allow any GtkDialog that implements GtkFileChooser as
        dialog.  (#335473, Tommi Komulainen)
This commit is contained in:
Matthias Clasen 2006-12-20 19:02:21 +00:00 committed by Matthias Clasen
parent e3655ec688
commit 2dc9ec7c43
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
Allow any GtkDialog that implements GtkFileChooser as
dialog. (#335473, Tommi Komulainen)
2006-12-20 Mikael Hallendal <micke@imendio.com> 2006-12-20 Mikael Hallendal <micke@imendio.com>
* gtk/gtkstatusicon.c: (gtk_status_icon_init): Fixed a last minute * gtk/gtkstatusicon.c: (gtk_status_icon_init): Fixed a last minute

11
gtk/gtkfilechooserbutton.c
View File

@ -354,7 +354,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
g_param_spec_object ("dialog", g_param_spec_object ("dialog",
P_("Dialog"), P_("Dialog"),
P_("The file chooser dialog to use."), P_("The file chooser dialog to use."),
GTK_TYPE_FILE_CHOOSER_DIALOG, GTK_TYPE_FILE_CHOOSER,
(GTK_PARAM_WRITABLE | (GTK_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY))); G_PARAM_CONSTRUCT_ONLY)));
@ -2755,11 +2755,12 @@ gtk_file_chooser_button_new_with_backend (const gchar *title,
/** /**
* gtk_file_chooser_button_new_with_dialog: * gtk_file_chooser_button_new_with_dialog:
* @dialog: the #GtkFileChooserDialog widget to use. * @dialog: the widget to use as dialog
* *
* Creates a #GtkFileChooserButton widget which uses @dialog as it's * Creates a #GtkFileChooserButton widget which uses @dialog as it's
* file-picking window. Note that @dialog must be a #GtkFileChooserDialog (or * file-picking window. Note that @dialog must be a #GtkDialog (or
* subclass) and must not have %GTK_DIALOG_DESTROY_WITH_PARENT set. * subclass) which implements the #GtkFileChooser interface and must
* not have %GTK_DIALOG_DESTROY_WITH_PARENT set.
* *
* Returns: a new button widget. * Returns: a new button widget.
* *
@ -2768,7 +2769,7 @@ gtk_file_chooser_button_new_with_backend (const gchar *title,
GtkWidget * GtkWidget *
gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog) gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog)
{ {
g_return_val_if_fail (GTK_IS_FILE_CHOOSER_DIALOG (dialog), NULL); g_return_val_if_fail (GTK_IS_FILE_CHOOSER (dialog) && GTK_IS_DIALOG (dialog), NULL);
return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON, return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
"dialog", dialog, "dialog", dialog,