diff options
Diffstat (limited to 'widgets/misc/e-cell-date-edit.c')
-rw-r--r-- | widgets/misc/e-cell-date-edit.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index b2a022a351..4e2dfe8831 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -153,7 +153,7 @@ e_cell_date_edit_class_init (GtkObjectClass *object_class) ecpc->popup = e_cell_date_edit_do_popup; - parent_class = gtk_type_class (e_cell_popup_get_type ()); + parent_class = g_type_class_ref(e_cell_popup_get_type ()); } @@ -205,7 +205,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_widget_show (vbox2); ecde->time_entry = gtk_entry_new (); - gtk_widget_set_usize (ecde->time_entry, 50, -1); + gtk_widget_set_size_request (ecde->time_entry, 50, -1); gtk_box_pack_start (GTK_BOX (vbox2), ecde->time_entry, FALSE, FALSE, 0); gtk_widget_show (ecde->time_entry); @@ -223,8 +223,8 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); gtk_widget_show (list); ecde->time_list = list; - gtk_signal_connect (GTK_OBJECT (list), "selection-changed", - GTK_SIGNAL_FUNC (e_cell_date_edit_on_time_selected), + g_signal_connect((list), "selection-changed", + G_CALLBACK (e_cell_date_edit_on_time_selected), ecde); bbox = gtk_hbutton_box_new (); @@ -238,42 +238,42 @@ e_cell_date_edit_init (ECellDateEdit *ecde) now_button = gtk_button_new_with_label (_("Now")); gtk_container_add (GTK_CONTAINER (bbox), now_button); gtk_widget_show (now_button); - gtk_signal_connect (GTK_OBJECT (now_button), "clicked", - GTK_SIGNAL_FUNC (e_cell_date_edit_on_now_clicked), + g_signal_connect((now_button), "clicked", + G_CALLBACK (e_cell_date_edit_on_now_clicked), ecde); ecde->now_button = now_button; today_button = gtk_button_new_with_label (_("Today")); gtk_container_add (GTK_CONTAINER (bbox), today_button); gtk_widget_show (today_button); - gtk_signal_connect (GTK_OBJECT (today_button), "clicked", - GTK_SIGNAL_FUNC (e_cell_date_edit_on_today_clicked), + g_signal_connect((today_button), "clicked", + G_CALLBACK (e_cell_date_edit_on_today_clicked), ecde); ecde->today_button = today_button; none_button = gtk_button_new_with_label (_("None")); gtk_container_add (GTK_CONTAINER (bbox), none_button); gtk_widget_show (none_button); - gtk_signal_connect (GTK_OBJECT (none_button), "clicked", - GTK_SIGNAL_FUNC (e_cell_date_edit_on_none_clicked), + g_signal_connect((none_button), "clicked", + G_CALLBACK (e_cell_date_edit_on_none_clicked), ecde); ecde->none_button = none_button; ok_button = gtk_button_new_with_label (_("OK")); gtk_container_add (GTK_CONTAINER (bbox), ok_button); gtk_widget_show (ok_button); - gtk_signal_connect (GTK_OBJECT (ok_button), "clicked", - GTK_SIGNAL_FUNC (e_cell_date_edit_on_ok_clicked), + g_signal_connect((ok_button), "clicked", + G_CALLBACK (e_cell_date_edit_on_ok_clicked), ecde); - gtk_signal_connect (GTK_OBJECT (ecde->popup_window), + g_signal_connect((ecde->popup_window), "key_press_event", - GTK_SIGNAL_FUNC (e_cell_date_edit_key_press), + G_CALLBACK (e_cell_date_edit_key_press), ecde); - gtk_signal_connect (GTK_OBJECT (ecde->popup_window), + g_signal_connect((ecde->popup_window), "button_press_event", - GTK_SIGNAL_FUNC (e_cell_date_edit_button_press), + G_CALLBACK (e_cell_date_edit_button_press), ecde); } @@ -565,7 +565,7 @@ e_cell_date_edit_show_popup (ECellDateEdit *ecde, e_cell_date_edit_get_popup_pos (ecde, row, view_col, &x, &y, &height, &width); gtk_widget_set_uposition (ecde->popup_window, x, y); - gtk_widget_set_usize (ecde->popup_window, width, height); + gtk_widget_set_size_request (ecde->popup_window, width, height); gtk_widget_realize (ecde->popup_window); gdk_window_resize (ecde->popup_window->window, width, height); gtk_widget_show (ecde->popup_window); |