X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkrecentchooserdialog.c;h=85cb8995ace10373b9e866ecaeac80aa7b85e223;hb=79695ee64d41c9aadfe2c6f18dc7dd1e3fd44852;hp=03de36c4066689fd49ab41a441182ba00c1be812;hpb=5f1b5d24067468fc86b28dccc504c71abdaf68b8;p=~andy%2Fgtk diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c index 03de36c40..85cb8995a 100644 --- a/gtk/gtkrecentchooserdialog.c +++ b/gtk/gtkrecentchooserdialog.c @@ -13,9 +13,7 @@ * 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 . */ #include "config.h" @@ -100,9 +98,6 @@ static void gtk_recent_chooser_dialog_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gtk_recent_chooser_dialog_map (GtkWidget *widget); -static void gtk_recent_chooser_dialog_unmap (GtkWidget *widget); - G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserDialog, gtk_recent_chooser_dialog, GTK_TYPE_DIALOG, @@ -113,16 +108,12 @@ static void gtk_recent_chooser_dialog_class_init (GtkRecentChooserDialogClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); gobject_class->set_property = gtk_recent_chooser_dialog_set_property; gobject_class->get_property = gtk_recent_chooser_dialog_get_property; gobject_class->constructor = gtk_recent_chooser_dialog_constructor; gobject_class->finalize = gtk_recent_chooser_dialog_finalize; - widget_class->map = gtk_recent_chooser_dialog_map; - widget_class->unmap = gtk_recent_chooser_dialog_unmap; - _gtk_recent_chooser_install_properties (gobject_class); g_type_class_add_private (klass, sizeof (GtkRecentChooserDialogPrivate)); @@ -143,7 +134,6 @@ gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog) content_area = gtk_dialog_get_content_area (rc_dialog); action_area = gtk_dialog_get_action_area (rc_dialog); - gtk_dialog_set_has_separator (rc_dialog, FALSE); gtk_container_set_border_width (GTK_CONTAINER (rc_dialog), 5); gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); @@ -281,29 +271,6 @@ gtk_recent_chooser_dialog_finalize (GObject *object) G_OBJECT_CLASS (gtk_recent_chooser_dialog_parent_class)->finalize (object); } -static void -gtk_recent_chooser_dialog_map (GtkWidget *widget) -{ - GtkRecentChooserDialog *dialog = GTK_RECENT_CHOOSER_DIALOG (widget); - GtkRecentChooserDialogPrivate *priv = dialog->priv; - - if (!gtk_widget_get_mapped (priv->chooser)) - gtk_widget_map (priv->chooser); - - GTK_WIDGET_CLASS (gtk_recent_chooser_dialog_parent_class)->map (widget); -} - -static void -gtk_recent_chooser_dialog_unmap (GtkWidget *widget) -{ - GtkRecentChooserDialog *dialog = GTK_RECENT_CHOOSER_DIALOG (widget); - GtkRecentChooserDialogPrivate *priv = dialog->priv; - - GTK_WIDGET_CLASS (gtk_recent_chooser_dialog_parent_class)->unmap (widget); - - gtk_widget_unmap (priv->chooser); -} - static GtkWidget * gtk_recent_chooser_dialog_new_valist (const gchar *title, GtkWindow *parent, @@ -338,7 +305,7 @@ gtk_recent_chooser_dialog_new_valist (const gchar *title, * @title: (allow-none): Title of the dialog, or %NULL * @parent: (allow-none): Transient parent of the dialog, or %NULL, * @first_button_text: (allow-none): stock ID or text to go in the first button, or %NULL - * @Varargs: response ID for the first button, then additional (button, id) + * @...: response ID for the first button, then additional (button, id) * pairs, ending with %NULL * * Creates a new #GtkRecentChooserDialog. This function is analogous to @@ -374,7 +341,7 @@ gtk_recent_chooser_dialog_new (const gchar *title, * @parent: (allow-none): Transient parent of the dialog, or %NULL, * @manager: a #GtkRecentManager * @first_button_text: (allow-none): stock ID or text to go in the first button, or %NULL - * @Varargs: response ID for the first button, then additional (button, id) + * @...: response ID for the first button, then additional (button, id) * pairs, ending with %NULL * * Creates a new #GtkRecentChooserDialog with a specified recent manager.